diff options
Diffstat (limited to 'tools')
215 files changed, 4778 insertions, 4778 deletions
diff --git a/tools/bootstrp/addexes/replace.cxx b/tools/bootstrp/addexes/replace.cxx index 3cc52bf1c825..3c451ae54be0 100644 --- a/tools/bootstrp/addexes/replace.cxx +++ b/tools/bootstrp/addexes/replace.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,11 +58,11 @@ int _cdecl main( int argc, char *argv[] ) ByteString aUpperText( aText ); aUpperText.ToUpperAscii(); - + ULONG nIndex; aSearch.ToUpperAscii(); - + nIndex = aUpperText.Search( aSearch.GetBuffer(), 0); while ( nIndex != STRING_NOTFOUND ) { diff --git a/tools/bootstrp/addexes2/mkfilt.cxx b/tools/bootstrp/addexes2/mkfilt.cxx index da9cd6c11352..2d03aaa153e5 100644 --- a/tools/bootstrp/addexes2/mkfilt.cxx +++ b/tools/bootstrp/addexes2/mkfilt.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,14 +36,14 @@ class TextFilter { protected: - FILE *pIn, *pOut; - virtual void Filter(); + FILE *pIn, *pOut; + virtual void Filter(); public: - TextFilter( ByteString aInFile = "stdin", + TextFilter( ByteString aInFile = "stdin", ByteString aOutFile = "stdout" ); - virtual ~TextFilter(); + virtual ~TextFilter(); - virtual void Execute(); + virtual void Execute(); }; TextFilter::TextFilter( ByteString aInFile, ByteString aOutFile ) @@ -86,11 +86,11 @@ class ByteStringList; class MkLine { public: - ByteString aLine; - ByteStringList* pPrivateTnrLst; - BOOL bOut; - BOOL bHier; - + ByteString aLine; + ByteStringList* pPrivateTnrLst; + BOOL bOut; + BOOL bHier; + MkLine(); }; @@ -105,11 +105,11 @@ DECLARE_LIST( ByteStringList, MkLine * ) class MkFilter : public TextFilter { - static ByteString aTnr; - ByteStringList *pLst; - ByteStringList *pTnrLst; + static ByteString aTnr; + ByteStringList *pLst; + ByteStringList *pTnrLst; protected: - virtual void Filter(); + virtual void Filter(); public: MkFilter( ByteString aInFile = "stdin", ByteString aOutFile = "stdout"); ~MkFilter(); @@ -141,7 +141,7 @@ void MkFilter::Filter() //fprintf(stderr, "aLine :%s\n", aLine.GetBuffer()); if ( aLine.Search("mkfilter1" ) != STRING_NOTFOUND ) { - // Zeilen unterdruecken + // Zeilen unterdruecken fprintf( stderr, "mkfilter1\n" ); nState = 0; } @@ -152,7 +152,7 @@ void MkFilter::Filter() nState = 1; } ; - + if ( nState == 0 ) { fprintf( stderr, "." ); @@ -160,7 +160,7 @@ void MkFilter::Filter() ByteString *pStr = new ByteString( aLineBuf ); pMkLine->aLine = *pStr; pMkLine->bOut = FALSE; - + pLst->Insert( pMkLine, LIST_APPEND ); } else if ( nState == 1 ) @@ -185,16 +185,16 @@ void MkFilter::Filter() ByteString *pStr = new ByteString( aLineBuf ); pMkLine->aLine = *pStr; pMkLine->bOut = FALSE; - + if ( bInTnrList ) pTnrLst->Insert( pMkLine, LIST_APPEND ); } else { /* Zeilen ignorieren */; } - } // End Of File + } // End Of File fprintf( stderr, "\n" ); - + // das File wieder ausgegeben ULONG nLines = pLst->Count(); for ( ULONG j=0; j<nLines; j++ ) @@ -220,7 +220,7 @@ void MkFilter::Filter() pLine->pPrivateTnrLst = NULL; } if ( pLine->bOut ) - fputs(pLine->aLine.GetBuffer(), pOut ); + fputs(pLine->aLine.GetBuffer(), pOut ); } fprintf( stderr, "\n" ); } diff --git a/tools/bootstrp/appdef.cxx b/tools/bootstrp/appdef.cxx index 938b4a526cc9..ac6212724afc 100644 --- a/tools/bootstrp/appdef.cxx +++ b/tools/bootstrp/appdef.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/bootstrp/command.cxx b/tools/bootstrp/command.cxx index eafadc204039..2ab0cc8dc4a6 100644 --- a/tools/bootstrp/command.cxx +++ b/tools/bootstrp/command.cxx @@ -1,7 +1,7 @@ -/************************************************************************* +/************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ #pragma warning (pop) #endif -//#define MH_TEST2 1 // fuers direkte Testen +//#define MH_TEST2 1 // fuers direkte Testen #if defined(WNT) || defined(OS2) #ifdef _MSC_VER @@ -77,7 +77,7 @@ #else #include <wait.h> #endif -#define P_WAIT 1 // erstmal einen dummz +#define P_WAIT 1 // erstmal einen dummz #endif #if defined WNT @@ -85,10 +85,10 @@ #endif #if defined(WNT) || defined(OS2) -#define cPathSeperator ';' +#define cPathSeperator ';' #endif #ifdef UNX -#define cPathSeperator ':' +#define cPathSeperator ':' #endif /*****************************************************************************/ @@ -470,19 +470,19 @@ CCommand::operator int() switch ( errno ) { - case E2BIG : + case E2BIG : nError = COMMAND_TOOBIG; break; - case EINVAL : + case EINVAL : nError = COMMAND_INVALID; break; - case ENOENT: + case ENOENT: nError = COMMAND_NOTFOUND; break; - case ENOEXEC : + case ENOEXEC : nError = COMMAND_NOEXEC; break; - case ENOMEM : + case ENOMEM : nError = COMMAND_NOMEM; break; default: @@ -509,7 +509,7 @@ ByteString CCommand::Search(ByteString aEnv, ByteString sItem) } DirEntry aItem( String( sItem, RTL_TEXTENCODING_ASCII_US )); - if ( aItem.Exists()) + if ( aItem.Exists()) return sItem; ByteString aEntry, sReturn; @@ -636,7 +636,7 @@ CCommandd::operator int() aStartupInfo.dwFillAttribute = FOREGROUND_RED | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_GREEN; -// aStartupInfo.dwFlags = STARTF_USESTDHANDLES; +// aStartupInfo.dwFlags = STARTF_USESTDHANDLES; //aStartupInfo.wShowWindow = SW_NORMAL; //SW_SHOWDEFAULT; //aStartupInfo.wShowWindow = SW_HIDE; //SW_SHOWNOACTIVATE; aStartupInfo.wShowWindow = SW_SHOWNOACTIVATE; diff --git a/tools/bootstrp/cppdep.cxx b/tools/bootstrp/cppdep.cxx index a617f0a7aad6..6263c719df51 100644 --- a/tools/bootstrp/cppdep.cxx +++ b/tools/bootstrp/cppdep.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include <stdio.h> #include <string.h> - + #include <unistd.h> #include <sys/stat.h> @@ -187,7 +187,7 @@ ByteString CppDep::IsIncludeStatement( ByteString aLine ) #ifdef DEBUG_VERBOSE fprintf( stderr, "found starting C comment : %s\n", aLine.GetBuffer() ); #endif - aLine.Erase(aLine.Search("/*",0), aLine.Len() - 1); + aLine.Erase(aLine.Search("/*",0), aLine.Len() - 1); #ifdef DEBUG_VERBOSE fprintf( stderr, "cleaned string : %s\n", aLine.GetBuffer() ); #endif @@ -197,7 +197,7 @@ ByteString CppDep::IsIncludeStatement( ByteString aLine ) #ifdef DEBUG_VERBOSE fprintf( stderr, "found C++ comment : %s\n", aLine.GetBuffer() ); #endif - aLine.Erase(aLine.Search("//",0), aLine.Len() - 1); + aLine.Erase(aLine.Search("//",0), aLine.Len() - 1); #ifdef DEBUG_VERBOSE fprintf( stderr, "cleaned string : %s\n", aLine.GetBuffer() ); #endif diff --git a/tools/bootstrp/cppdep.hxx b/tools/bootstrp/cppdep.hxx index 987666f4bc18..cdc3ac2e9758 100644 --- a/tools/bootstrp/cppdep.hxx +++ b/tools/bootstrp/cppdep.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,31 +28,31 @@ #include <tools/list.hxx> #include <tools/string.hxx> #define PATH_SEP ":" -#define DIR_SEP "/" +#define DIR_SEP "/" DECLARE_LIST( ByteStringList, ByteString * ) class CppDep { - ByteString aSourceFile; - ByteStringList *pSearchPath; + ByteString aSourceFile; + ByteStringList *pSearchPath; protected: - ByteStringList *pFileList; - ByteStringList *pSources; + ByteStringList *pFileList; + ByteStringList *pSources; - BOOL Search( ByteString aFileName ); - ByteString Exists( ByteString aFileName ); + BOOL Search( ByteString aFileName ); + ByteString Exists( ByteString aFileName ); - ByteString IsIncludeStatement( ByteString aLine ); + ByteString IsIncludeStatement( ByteString aLine ); public: CppDep( ByteString aFileName ); CppDep(); virtual ~CppDep(); - virtual void Execute(); + virtual void Execute(); - ByteStringList* GetDepList(){return pFileList;} - BOOL AddSearchPath( const char* aPath ); - BOOL AddSource( const char * aSource ); + ByteStringList* GetDepList(){return pFileList;} + BOOL AddSearchPath( const char* aPath ); + BOOL AddSource( const char * aSource ); }; diff --git a/tools/bootstrp/inimgr.cxx b/tools/bootstrp/inimgr.cxx index 8c872e1cb5c4..a0a69f06f7af 100644 --- a/tools/bootstrp/inimgr.cxx +++ b/tools/bootstrp/inimgr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/bootstrp/iserver.cxx b/tools/bootstrp/iserver.cxx index 5f25f04d487b..0b2c1df15203 100644 --- a/tools/bootstrp/iserver.cxx +++ b/tools/bootstrp/iserver.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/bootstrp/md5.cxx b/tools/bootstrp/md5.cxx index 5b65e79f7dec..687441c5c511 100644 --- a/tools/bootstrp/md5.cxx +++ b/tools/bootstrp/md5.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,16 +36,16 @@ #include <tools/string.hxx> #ifdef WNT -#define FILE_OPEN_READ "rb" +#define FILE_OPEN_READ "rb" #else -#define FILE_OPEN_READ "r" +#define FILE_OPEN_READ "r" #endif // Extended calc_md5_checksum to recognize Windows executables and libraries. To // create the same md5 checksum for a (code/data) identical file it ignores a different // date and header checksum. Please see crashrep/source/win32/soreport.cpp // where the same method is also used. The crash reporter uses the MD5 -// checksums to transfer them to the crash database. You have to make sure that both +// checksums to transfer them to the crash database. You have to make sure that both // methods use the same algorithm otherwise there could be problems with stack reports. void normalize_pe_image(sal_uInt8* buffer, size_t nBufferSize) @@ -55,7 +55,7 @@ void normalize_pe_image(sal_uInt8* buffer, size_t nBufferSize) const int PE_SIGNATURE_SIZE = 4; const int COFFHEADER_SIZE = 20; const int OFFSET_PE_OPTIONALHEADER_CHECKSUM = 64; - + // Check the header part of the file buffer if (buffer[0] == sal_uInt8('M') && buffer[1] == sal_uInt8('Z')) { @@ -72,7 +72,7 @@ void normalize_pe_image(sal_uInt8* buffer, size_t nBufferSize) { // Set timedatestamp and checksum fields to a normalized // value to enforce the same MD5 checksum for identical - // Windows executables/libraries. + // Windows executables/libraries. buffer[PEHeaderOffset+OFFSET_COFF_TIMEDATESTAMP+0] = 0; buffer[PEHeaderOffset+OFFSET_COFF_TIMEDATESTAMP+1] = 0; buffer[PEHeaderOffset+OFFSET_COFF_TIMEDATESTAMP+2] = 0; @@ -98,7 +98,7 @@ rtlDigestError calc_md5_checksum( const char *filename, ByteString &aChecksum ) const size_t MINIMAL_SIZE = 512; sal_uInt8 checksum[RTL_DIGEST_LENGTH_MD5]; - rtlDigestError error = rtl_Digest_E_None; + rtlDigestError error = rtl_Digest_E_None; FILE *fp = fopen( filename, FILE_OPEN_READ ); @@ -108,9 +108,9 @@ rtlDigestError calc_md5_checksum( const char *filename, ByteString &aChecksum ) if ( digest ) { - size_t nBytesRead; - sal_uInt8 buffer[BUFFER_SIZE]; - bool bHeader(true); + size_t nBytesRead; + sal_uInt8 buffer[BUFFER_SIZE]; + bool bHeader(true); while ( rtl_Digest_E_None == error && 0 != (nBytesRead = fread( buffer, 1, sizeof(buffer), fp )) ) @@ -121,8 +121,8 @@ rtlDigestError calc_md5_checksum( const char *filename, ByteString &aChecksum ) if (nBytesRead >= MINIMAL_SIZE && buffer[0] == sal_uInt8('M') && buffer[1] == sal_uInt8('Z') ) normalize_pe_image(buffer, nBytesRead); } - - error = rtl_digest_updateMD5( digest, buffer, nBytesRead ); + + error = rtl_digest_updateMD5( digest, buffer, nBytesRead ); } if ( rtl_Digest_E_None == error ) @@ -135,7 +135,7 @@ rtlDigestError calc_md5_checksum( const char *filename, ByteString &aChecksum ) for ( std::size_t i = 0; i < sizeof(checksum); i++ ) { if ( checksum[i] < 16 ) - aChecksum.Append( "0" ); + aChecksum.Append( "0" ); aChecksum += ByteString::CreateFromInt32( checksum[i], 16 ); } } diff --git a/tools/bootstrp/md5.hxx b/tools/bootstrp/md5.hxx index a483001784b0..55aa97e941c9 100644 --- a/tools/bootstrp/md5.hxx +++ b/tools/bootstrp/md5.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/bootstrp/mkcreate.cxx b/tools/bootstrp/mkcreate.cxx index dae7581af466..398a3a4c4143 100644 --- a/tools/bootstrp/mkcreate.cxx +++ b/tools/bootstrp/mkcreate.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,7 +87,7 @@ SourceDirectory::~SourceDirectory() /*****************************************************************************/ CodedDependency *SourceDirectory::AddCodedDependency( - const ByteString &rCodedIdentifier, USHORT nOperatingSystems ) + const ByteString &rCodedIdentifier, USHORT nOperatingSystems ) /*****************************************************************************/ { CodedDependency *pReturn = NULL; @@ -116,7 +116,7 @@ CodedDependency *SourceDirectory::AddCodedDependency( /*****************************************************************************/ CodedDependency *SourceDirectory::AddCodedIdentifier( - const ByteString &rCodedIdentifier, USHORT nOperatingSystems ) + const ByteString &rCodedIdentifier, USHORT nOperatingSystems ) /*****************************************************************************/ { CodedDependency *pReturn = NULL; @@ -536,8 +536,8 @@ SourceDirectory *SourceDirectory::CreateRootDirectory( ByteString sStandLst( aIniManager.ToLocal( sDefLst )); String s = String( sStandLst, gsl_getSystemTextEncoding()); InformationParser aParser; -// fprintf( stderr, -// "Reading database %s ...\n", sStandLst.GetBuffer()); +// fprintf( stderr, +// "Reading database %s ...\n", sStandLst.GetBuffer()); GenericInformationList *pVerList = aParser.Execute( s ); @@ -560,13 +560,13 @@ SourceDirectory *SourceDirectory::CreateRootDirectory( sSolarList = aIniManager.ToLocal( sSolarList ); fprintf( stderr, - "Reading directory information %s ...\n", sSolarList.GetBuffer()); + "Reading directory information %s ...\n", sSolarList.GetBuffer()); */ ByteString sVersion( rVersion ); Star aStar( pVerList, sVersion, TRUE, rRoot.GetBuffer()); -// fprintf( stderr, -// "Creating virtual directory tree ...\n" ); +// fprintf( stderr, +// "Creating virtual directory tree ...\n" ); SourceDirectory *pSourceRoot = new SourceDirectory( rRoot, OS_ALL ); diff --git a/tools/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx index 39483930a83e..4f4d44a33536 100644 --- a/tools/bootstrp/prj.cxx +++ b/tools/bootstrp/prj.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #include "bootstrp/prj.hxx" #include "bootstrp/inimgr.hxx" -//#define TEST 1 +//#define TEST 1 #if defined(WNT) || defined(OS2) #define LIST_DELIMETER ';' @@ -50,7 +50,7 @@ Link Star::aDBNotFoundHdl; // -// class SimpleConfig +// class SimpleConfig // /*****************************************************************************/ @@ -98,7 +98,7 @@ ByteString SimpleConfig::GetNext() } /*****************************************************************************/ -ByteString SimpleConfig::GetNextLine() +ByteString SimpleConfig::GetNextLine() /*****************************************************************************/ { ByteString aSecStr; @@ -140,7 +140,7 @@ ByteString SimpleConfig::GetCleanedNextLine( BOOL bReadComments ) aTmpStr = aTmpStr.EraseLeadingChars(); aTmpStr = aTmpStr.EraseTrailingChars(); -// while ( aTmpStr.SearchAndReplace(String(' '),String('\t') ) != (USHORT)-1 ); +// while ( aTmpStr.SearchAndReplace(String(' '),String('\t') ) != (USHORT)-1 ); int nLength = aTmpStr.Len(); ByteString aEraseString; BOOL bFirstTab = TRUE; @@ -169,7 +169,7 @@ ByteString SimpleConfig::GetCleanedNextLine( BOOL bReadComments ) // -// class CommandData +// class CommandData // /*****************************************************************************/ @@ -278,7 +278,7 @@ CommandData* Prj::GetDirectoryData( ByteString aLogFileName ) } // -// class Prj +// class Prj // /*****************************************************************************/ @@ -423,7 +423,7 @@ CommandData* Prj::RemoveDirectory ( ByteString aLogFileName ) } // -// class Star +// class Star // /*****************************************************************************/ @@ -451,7 +451,7 @@ Star::Star( SolarFileList *pSolarFiles ) } /*****************************************************************************/ -Star::Star( GenericInformationList *pStandLst, ByteString &rVersion, +Star::Star( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal, const char *pSourceRoot ) /*****************************************************************************/ { @@ -545,7 +545,7 @@ Star::Star( GenericInformationList *pStandLst, ByteString &rVersion, aPrjEntry += DirEntry( sPrjDir ); aPrjEntry += DirEntry( sSolarFile ); - pFileList->Insert( new String( aPrjEntry.GetFull()), LIST_APPEND ); + pFileList->Insert( new String( aPrjEntry.GetFull()), LIST_APPEND ); ByteString sFile( aPrjEntry.GetFull(), RTL_TEXTENCODING_ASCII_US ); } @@ -581,7 +581,7 @@ BOOL Star::NeedsUpdate() } /*****************************************************************************/ -void Star::Read( String &rFileName ) +void Star::Read( String &rFileName ) /*****************************************************************************/ { ByteString aString; @@ -623,7 +623,7 @@ void Star::Read( SolarFileList *pSolarFiles ) } aMutex.acquire(); - aLoadedFilesList.Insert( pFile, LIST_APPEND ); + aLoadedFilesList.Insert( pFile, LIST_APPEND ); aMutex.release(); delete pSolarFiles->Remove(( ULONG ) 0 ); } @@ -937,7 +937,7 @@ Prj* Star::GetPrj ( ByteString aProjectName ) if ( pPrj->GetProjectName().EqualsIgnoreCaseAscii(aProjectName) ) return pPrj; } -// return (Prj*)NULL; +// return (Prj*)NULL; return 0L ; } @@ -964,7 +964,7 @@ ByteString Star::GetPrjName( DirEntry &aPath ) // -// class StarWriter +// class StarWriter // /*****************************************************************************/ @@ -982,7 +982,7 @@ StarWriter::StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments ) } /*****************************************************************************/ -StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, +StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal, const char *pSourceRoot ) /*****************************************************************************/ { @@ -1076,7 +1076,7 @@ StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, aPrjEntry += DirEntry( sPrjDir ); aPrjEntry += DirEntry( sSolarFile ); - pFileList->Insert( new String( aPrjEntry.GetFull()), LIST_APPEND ); + pFileList->Insert( new String( aPrjEntry.GetFull()), LIST_APPEND ); ByteString sFile( aPrjEntry.GetFull(), RTL_TEXTENCODING_ASCII_US ); fprintf( stdout, "%s\n", sFile.GetBuffer()); @@ -1152,7 +1152,7 @@ USHORT StarWriter::Read( SolarFileList *pSolarFiles, BOOL bReadComments ) } aMutex.acquire(); - aLoadedFilesList.Insert( pFile, LIST_APPEND ); + aLoadedFilesList.Insert( pFile, LIST_APPEND ); aMutex.release(); delete pSolarFiles->Remove(( ULONG ) 0 ); } @@ -1314,7 +1314,7 @@ void StarWriter::InsertTokenLine ( ByteString& rString ) int i = 0; ByteString aWhat, aWhatOS, sClientRestriction, aLogFileName, aProjectName, aPrefix, aCommandPara; - static ByteString aDirName; + static ByteString aDirName; BOOL bPrjDep = FALSE; BOOL bHardDep = FALSE; USHORT nCommandType = 0; @@ -1591,7 +1591,7 @@ BOOL StarFile::NeedsUpdate() return TRUE; } FileStat aStat( aEntry ); - if (( aStat.DateModified() > aDate ) || + if (( aStat.DateModified() > aDate ) || (( aStat.DateModified() == aDate ) && ( aStat.TimeModified() > aTime ))) return TRUE; } diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx index a35c92e17421..37edfc6a8c18 100644 --- a/tools/bootstrp/rscdep.cxx +++ b/tools/bootstrp/rscdep.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ #include "cppdep.hxx" -#if defined WNT +#if defined WNT #if !defined HAVE_GETOPT #define __STDC__ 1 #define __GNU_LIBRARY__ @@ -59,12 +59,12 @@ class RscHrcDep : public CppDep { public: RscHrcDep(); - virtual ~RscHrcDep(); + virtual ~RscHrcDep(); - virtual void Execute(); + virtual void Execute(); }; -RscHrcDep::RscHrcDep() : +RscHrcDep::RscHrcDep() : CppDep() { } @@ -91,11 +91,11 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv ) BOOL bSource = FALSE; ByteString aRespArg; // who needs anything but '/' ? -// String aDelim = String(DirEntry::GetAccessDelimiter()); +// String aDelim = String(DirEntry::GetAccessDelimiter()); String aDelim = '/'; RscHrcDep *pDep = new RscHrcDep; - + pOutputFileName[0] = 0; pSrsFileName[0] = 0; @@ -219,9 +219,9 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv ) DirEntry aEntry("."); aEntry.ToAbs(); -// String aCwd = aEntry.GetName(); +// String aCwd = aEntry.GetName(); String aCwd(pFileNamePrefix, gsl_getSystemTextEncoding()); -/* USHORT nPos; +/* USHORT nPos; #ifndef UNX while ( (nPos = aCwd.Search('\\') != STRING_NOTFOUND )) #else @@ -259,7 +259,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv ) { if (!bSource ) { - aString += ByteString(" " ); + aString += ByteString(" " ); aString += ByteString( argv[optind]); pDep->AddSource( argv[optind++]); } diff --git a/tools/bootstrp/so_checksum.cxx b/tools/bootstrp/so_checksum.cxx index 41e45a4796c3..716e99eff9f1 100644 --- a/tools/bootstrp/so_checksum.cxx +++ b/tools/bootstrp/so_checksum.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/bootstrp/sspretty.cxx b/tools/bootstrp/sspretty.cxx index 8973896dc692..143705b6a2ea 100644 --- a/tools/bootstrp/sspretty.cxx +++ b/tools/bootstrp/sspretty.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ int _cdecl main( int argc, char *argv[] ) String aFileName( argv[ 1 ], RTL_TEXTENCODING_ASCII_US ); InformationParser aParser; GenericInformationList *pList = aParser.Execute( aFileName ); - if ( pList ) + if ( pList ) aParser.Save( aFileName, pList ); else { fprintf( stderr, "Error reading input file!\n" ); diff --git a/tools/bootstrp/sstring.cxx b/tools/bootstrp/sstring.cxx index 36500b6f086e..8c83dedf72ec 100644 --- a/tools/bootstrp/sstring.cxx +++ b/tools/bootstrp/sstring.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ # define _TOOLS_STRINGLIST #endif -#define ENABLE_BYTESTRING_STREAM_OPERATORS +#define ENABLE_BYTESTRING_STREAM_OPERATORS #include <tools/stream.hxx> #include "bootstrp/sstring.hxx" @@ -104,8 +104,8 @@ ULONG SByteStringList::GetPrevString( ByteString* pStr ) /************************************************************************** * -* Sortiert einen ByteString in die Liste ein und gibt die Position, -* an der einsortiert wurde, zurueck +* Sortiert einen ByteString in die Liste ein und gibt die Position, +* an der einsortiert wurde, zurueck * **************************************************************************/ @@ -170,7 +170,7 @@ SByteStringList& SByteStringList::operator<< ( SvStream& rStream ) { sal_uInt32 nListCount; rStream >> nListCount; - for ( USHORT i = 0; i < nListCount; i++ ) { + for ( USHORT i = 0; i < nListCount; i++ ) { ByteString* pByteString = new ByteString(); rStream >> *pByteString; Insert (pByteString, LIST_APPEND); @@ -264,8 +264,8 @@ ULONG SUniStringList::GetPrevString( UniString* pStr ) /************************************************************************** * -* Sortiert einen UniString in die Liste ein und gibt die Position, -* an der einsortiert wurde, zurueck +* Sortiert einen UniString in die Liste ein und gibt die Position, +* an der einsortiert wurde, zurueck * **************************************************************************/ diff --git a/tools/inc/bootstrp/appdef.hxx b/tools/inc/bootstrp/appdef.hxx index 44792aa3cdf2..bf73b215205e 100644 --- a/tools/inc/bootstrp/appdef.hxx +++ b/tools/inc/bootstrp/appdef.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,27 +30,27 @@ #ifdef UNX -#define DEFAULT_INI_ROOT "/so/env" -#define DEFAULT_BS_ROOT "/so/env/b_server" -#define PATH_SEPARATOR '/' -#define S_PATH_SEPARATOR "/" +#define DEFAULT_INI_ROOT "/so/env" +#define DEFAULT_BS_ROOT "/so/env/b_server" +#define PATH_SEPARATOR '/' +#define S_PATH_SEPARATOR "/" #else -#define DEFAULT_INI_ROOT "r:" -#define DEFAULT_BS_ROOT "n:" -#define PATH_SEPARATOR '\\' -#define S_PATH_SEPARATOR "\\" +#define DEFAULT_INI_ROOT "r:" +#define DEFAULT_BS_ROOT "n:" +#define PATH_SEPARATOR '\\' +#define S_PATH_SEPARATOR "\\" #endif -#define _INI_DRV DEFAULT_INI_ROOT -#define B_SERVER_ROOT DEFAULT_BS_ROOT -#define _SOLARLIST B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "solar.lst" -#define _DEF_STAND_LIST B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "stand.lst" -#define _DEF_SSOLARINI B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "ssolar.ini" -#define _DEF_SSCOMMON B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "ssolar.cmn" -#define _INIROOT B_SERVER_ROOT S_PATH_SEPARATOR "config" -#define _INIROOT_OLD B_SERVER_ROOT S_PATH_SEPARATOR "config" -#define _INI_UNC "\\\\jumbo2.germany.sun.com\\R-Laufwerk" -#define _INI_UNC_OLD "\\\\jumbo2.germany.sun.com\\R-Laufwerk" +#define _INI_DRV DEFAULT_INI_ROOT +#define B_SERVER_ROOT DEFAULT_BS_ROOT +#define _SOLARLIST B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "solar.lst" +#define _DEF_STAND_LIST B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "stand.lst" +#define _DEF_SSOLARINI B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "ssolar.ini" +#define _DEF_SSCOMMON B_SERVER_ROOT S_PATH_SEPARATOR "config" S_PATH_SEPARATOR "ssolar.cmn" +#define _INIROOT B_SERVER_ROOT S_PATH_SEPARATOR "config" +#define _INIROOT_OLD B_SERVER_ROOT S_PATH_SEPARATOR "config" +#define _INI_UNC "\\\\jumbo2.germany.sun.com\\R-Laufwerk" +#define _INI_UNC_OLD "\\\\jumbo2.germany.sun.com\\R-Laufwerk" // path conversion diff --git a/tools/inc/bootstrp/command.hxx b/tools/inc/bootstrp/command.hxx index f8e22a25efc7..638beb6cce1f 100644 --- a/tools/inc/bootstrp/command.hxx +++ b/tools/inc/bootstrp/command.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,26 +42,26 @@ */ enum ExeType { - EXE, /// programm is a native executable - BAT, /// programm is a DOS-Batch - BTM /// programm is a 4DOS-Batch + EXE, /// programm is a native executable + BAT, /// programm is a DOS-Batch + BTM /// programm is a 4DOS-Batch }; -#define COMMAND_NOTFOUND 0x0001 -#define COMMAND_TOOBIG 0x0002 -#define COMMAND_INVALID 0x0004 -#define COMMAND_NOEXEC 0x0008 -#define COMMAND_NOMEM 0x0010 -#define COMMAND_UNKNOWN 0x0020 +#define COMMAND_NOTFOUND 0x0001 +#define COMMAND_TOOBIG 0x0002 +#define COMMAND_INVALID 0x0004 +#define COMMAND_NOEXEC 0x0008 +#define COMMAND_NOMEM 0x0010 +#define COMMAND_UNKNOWN 0x0020 #ifdef WNT -#define COMMAND_SHELL "4nt.exe" +#define COMMAND_SHELL "4nt.exe" #endif #ifdef OS2 #define COMMAND_SHELL "4os2.exe" #endif #ifdef UNX -#define COMMAND_SHELL "csh" +#define COMMAND_SHELL "csh" #endif class CommandLine; @@ -71,25 +71,25 @@ class CommandLine { friend class ChildProcess; private: - char *CommandBuffer; - char *ComShell; - char **ppArgv; - BOOL bTmpWrite; + char *CommandBuffer; + char *ComShell; + char **ppArgv; + BOOL bTmpWrite; public: CommandLine(BOOL bTmpWrite = FALSE); CommandLine(const char *, BOOL bTmpWrite = FALSE); CommandLine(const CommandLine&, BOOL bTmpWrite = FALSE); - virtual ~CommandLine(); + virtual ~CommandLine(); - int nArgc; + int nArgc; - CommandLine& operator=(const CommandLine&); - CommandLine& operator=(const char *); - void BuildCommand(const char *); - char** GetCommand(void) { return ppArgv; } - void Strtokens(const char *); - void Print(); + CommandLine& operator=(const CommandLine&); + CommandLine& operator=(const char *); + void BuildCommand(const char *); + char** GetCommand(void) { return ppArgv; } + void Strtokens(const char *); + void Print(); }; /** Declares and spawns a child process. @@ -98,16 +98,16 @@ public: class CCommand { private: - ByteString aCommandLine; - ByteString aCommand; - char *pArgv; - char **ppArgv; - ULONG nArgc; - int nError; + ByteString aCommandLine; + ByteString aCommand; + char *pArgv; + char **ppArgv; + ULONG nArgc; + int nError; protected: - void ImplInit(); - void Initpp( ULONG nCount, ByteString &rStr ); + void ImplInit(); + void Initpp( ULONG nCount, ByteString &rStr ); public: /** Creates the process specified without spawning it @@ -125,7 +125,7 @@ public: @param sItem specifies the system shell @return the Location (when programm was found) */ - static ByteString Search( ByteString sEnv, + static ByteString Search( ByteString sEnv, ByteString sItem = COMMAND_SHELL ); /** Spawns the Process @@ -133,14 +133,14 @@ public: */ operator int(); - ByteString GetCommandLine_() { return aCommandLine; } - ByteString GetCommand() { return aCommand; } + ByteString GetCommandLine_() { return aCommandLine; } + ByteString GetCommand() { return aCommand; } - char** GetCommandStr() { return ppArgv; } + char** GetCommandStr() { return ppArgv; } }; -#define COMMAND_EXECUTE_WINDOW 0x0000001 -#define COMMAND_EXECUTE_CONSOLE 0x0000002 +#define COMMAND_EXECUTE_WINDOW 0x0000001 +#define COMMAND_EXECUTE_CONSOLE 0x0000002 #define COMMAND_EXECUTE_HIDDEN 0x0000004 #define COMMAND_EXECUTE_START 0x0000008 #define COMMAND_EXECUTE_WAIT 0x0000010 @@ -153,7 +153,7 @@ typedef ULONG CommandBits; */ class CCommandd : public CCommand { - CommandBits nFlag; + CommandBits nFlag; public: CCommandd( ByteString &rString, CommandBits nBits ); CCommandd( const char *pChar, CommandBits nBits ); diff --git a/tools/inc/bootstrp/inimgr.hxx b/tools/inc/bootstrp/inimgr.hxx index 9abcd33ff384..7be00ce14d48 100644 --- a/tools/inc/bootstrp/inimgr.hxx +++ b/tools/inc/bootstrp/inimgr.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,8 +41,8 @@ class IniManager private: BOOL bUpdate; - ByteString sGlobalDir; /// holds the org. ini dir - ByteString sLocalPath; /// holds path of local ini dir + ByteString sGlobalDir; /// holds the org. ini dir + ByteString sLocalPath; /// holds path of local ini dir public: IniManager( ByteString &rDir, ByteString &rLocalDir ); @@ -50,7 +50,7 @@ public: IniManager(); ByteString ToLocal( ByteString &rPath ); - void Update(); /// Call ForceUpdate the First Time called + void Update(); /// Call ForceUpdate the First Time called void ForceUpdate(); static ByteString GetLocalIni(); diff --git a/tools/inc/bootstrp/listmacr.hxx b/tools/inc/bootstrp/listmacr.hxx index c66eb875b4d3..8c678ff32275 100644 --- a/tools/inc/bootstrp/listmacr.hxx +++ b/tools/inc/bootstrp/listmacr.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,24 +28,24 @@ #ifndef _LISTMACR_HXX #define _LISTMACR_HXX -#define DECL_DEST_LIST( TmpListType, ListType, PointerType ) \ -DECLARE_LIST(TmpListType, PointerType) \ -class ListType : public TmpListType \ -{ \ -public: \ +#define DECL_DEST_LIST( TmpListType, ListType, PointerType ) \ +DECLARE_LIST(TmpListType, PointerType) \ +class ListType : public TmpListType \ +{ \ +public: \ void ClearAndDelete() \ - { \ - while ( Count()) { \ - PointerType pTmp = GetObject(( ULONG ) 0 ); \ - delete pTmp; \ - Remove(( ULONG ) 0 ); \ - } \ - } \ - ~ListType() \ - { \ - ClearAndDelete(); \ - } \ -}; \ + { \ + while ( Count()) { \ + PointerType pTmp = GetObject(( ULONG ) 0 ); \ + delete pTmp; \ + Remove(( ULONG ) 0 ); \ + } \ + } \ + ~ListType() \ + { \ + ClearAndDelete(); \ + } \ +}; \ #endif diff --git a/tools/inc/bootstrp/mkcreate.hxx b/tools/inc/bootstrp/mkcreate.hxx index f33cb02903ea..991b5961a096 100644 --- a/tools/inc/bootstrp/mkcreate.hxx +++ b/tools/inc/bootstrp/mkcreate.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,14 +44,14 @@ class SourceDirectoryList; class CodedDependency : public ByteString { private: - USHORT nOSType; // operating systems where dependeny exists + USHORT nOSType; // operating systems where dependeny exists public: /* create a dependency instance with given coded directory name */ CodedDependency( const ByteString &rCodedIdentifier, // the coded name of the directory - USHORT nOperatingSystems // the operating systems where this dependency exists + USHORT nOperatingSystems // the operating systems where this dependency exists ) : ByteString( rCodedIdentifier ), nOSType( nOperatingSystems ) @@ -76,7 +76,7 @@ public: */ BOOL TryToMerge( const ByteString &rCodedIdentifier, // the coded name of the directory - USHORT nOperatingSystems // the operating systems where this dependency exists + USHORT nOperatingSystems // the operating systems where this dependency exists ) { if ( rCodedIdentifier != *this ) @@ -93,14 +93,14 @@ public: class Dependency : public ByteString { private: - USHORT nOSType; // operating systems where dependecy exists + USHORT nOSType; // operating systems where dependecy exists public: /* create a dependency instance with given directory name */ Dependency( - const ByteString &rDirectoryName, // the coded name of the directory - USHORT nOperatingSystems // the operating systems where this dependency exists + const ByteString &rDirectoryName, // the coded name of the directory + USHORT nOperatingSystems // the operating systems where this dependency exists ) : ByteString( rDirectoryName ), nOSType( nOperatingSystems ) @@ -122,26 +122,26 @@ public: class SourceDirectory : public ByteString { private: - SourceDirectory *pParent; // the parent directory - SourceDirectoryList *pSubDirectories; // list of sub directories - USHORT nOSType; // operating systems where this directory is used - USHORT nDepth; // depth of directory structure (root is 0) + SourceDirectory *pParent; // the parent directory + SourceDirectoryList *pSubDirectories; // list of sub directories + USHORT nOSType; // operating systems where this directory is used + USHORT nDepth; // depth of directory structure (root is 0) - SByteStringList *pDependencies; // dependencies on other directories in this depth + SByteStringList *pDependencies; // dependencies on other directories in this depth - SByteStringList *pCodedDependencies; // dependencies on other directories in different depth - SByteStringList *pCodedIdentifier; // symbolic identifier to resolve dependencies + SByteStringList *pCodedDependencies; // dependencies on other directories in different depth + SByteStringList *pCodedIdentifier; // symbolic identifier to resolve dependencies /* try to resolve a single dependency */ Dependency *ResolvesDependency( - CodedDependency *pCodedDependency // the dependency + CodedDependency *pCodedDependency // the dependency ); /* returns the operating systems of a coded dependency */ static USHORT GetOSType( - const ByteString &sDependExt // the corresponding dependency extension (see also prj.hxx) + const ByteString &sDependExt // the corresponding dependency extension (see also prj.hxx) ); /* removes this and all sub directories with all dependencies @@ -154,9 +154,9 @@ public: * (not the file system root but the root of the source tree, e.g. o:\569) */ SourceDirectory( - const ByteString &rDirectoryName, // name without parent - USHORT nOperatingSystem, // the operating systems where this directory is used - SourceDirectory *pParentDirectory = NULL // parent (if not root) + const ByteString &rDirectoryName, // name without parent + USHORT nOperatingSystem, // the operating systems where this directory is used + SourceDirectory *pParentDirectory = NULL // parent (if not root) ); ~SourceDirectory(); @@ -175,15 +175,15 @@ public: /* returns the given directory */ SourceDirectory *GetDirectory( - const ByteString &rDirectoryName, // full path - USHORT nOperatingSystem // the operating systems where this directory is used + const ByteString &rDirectoryName, // full path + USHORT nOperatingSystem // the operating systems where this directory is used ); /* create the directory and all mandatory parents */ SourceDirectory *InsertFull( - const ByteString &rDirectoryName, // full path - USHORT nOperatingSystem // the operating systems where this directory is used + const ByteString &rDirectoryName, // full path + USHORT nOperatingSystem // the operating systems where this directory is used ) { return GetDirectory( rDirectoryName, nOperatingSystem ); @@ -192,8 +192,8 @@ public: /* create the directory as sub directory of this directory */ SourceDirectory *Insert( - const ByteString &rDirectoryName, // name without parent - USHORT nOperatingSystem // the operating systems where this directory is used + const ByteString &rDirectoryName, // name without parent + USHORT nOperatingSystem // the operating systems where this directory is used ); /* get the root directory @@ -203,15 +203,15 @@ public: /* get sub directory if exists */ SourceDirectory *GetSubDirectory( - const ByteString &rDirectoryPath, // full sub path - USHORT nOperatingSystem // the operating systems where this directory is used + const ByteString &rDirectoryPath, // full sub path + USHORT nOperatingSystem // the operating systems where this directory is used ); /* add a dependency for several platforms */ CodedDependency *AddCodedDependency( const ByteString &rCodedIdentifier, // the coded name of the directory - USHORT nOperatingSystems // the operating systems where this dependency exists + USHORT nOperatingSystems // the operating systems where this dependency exists ); /* returns the dependency list @@ -225,7 +225,7 @@ public: */ CodedDependency *AddCodedIdentifier( const ByteString &rCodedIdentifier, // the coded name of the directory - USHORT nOperatingSystems // the operating systems where this dependency exists + USHORT nOperatingSystems // the operating systems where this dependency exists ); /* returns the identifier list @@ -250,15 +250,15 @@ public: /* create the full directory tree (only virtual, not in file system) */ static SourceDirectory *CreateRootDirectory( - const ByteString &rRoot, // the root directory in file system - const ByteString &rVersion, // the solar verion (r.g. SRC590, SRC591 etc.) - BOOL bAll = FALSE // add all directories or only buildable ones + const ByteString &rRoot, // the root directory in file system + const ByteString &rVersion, // the solar verion (r.g. SRC590, SRC591 etc.) + BOOL bAll = FALSE // add all directories or only buildable ones ); /* create the makefile.rc in file system */ BOOL CreateRecursiveMakefile( - BOOL bAllChilds = FALSE // create rcursive for all sub directories + BOOL bAllChilds = FALSE // create rcursive for all sub directories ); }; @@ -279,13 +279,13 @@ public: /* search for a directory by directory name */ SourceDirectory *Search( - const ByteString &rDirectoryName // name without parent + const ByteString &rDirectoryName // name without parent ); /* insert a new directory */ ULONG InsertSorted( - SourceDirectory *pDirectory // directory + SourceDirectory *pDirectory // directory ) { return PutString(( ByteString * ) pDirectory ); diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx index 2fb536da0d41..2d7664b8b69f 100644 --- a/tools/inc/bootstrp/prj.hxx +++ b/tools/inc/bootstrp/prj.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,19 +33,19 @@ #include "bootstrp/listmacr.hxx" #include <vos/mutex.hxx> -#define OS_NONE 0x0000 -#define OS_WIN16 0x0001 -#define OS_WIN32 0x0002 -#define OS_OS2 0x0004 -#define OS_UNX 0x0008 -#define OS_ALL ( OS_WIN16 | OS_WIN32 | OS_OS2 | OS_UNX ) +#define OS_NONE 0x0000 +#define OS_WIN16 0x0001 +#define OS_WIN32 0x0002 +#define OS_OS2 0x0004 +#define OS_UNX 0x0008 +#define OS_ALL ( OS_WIN16 | OS_WIN32 | OS_OS2 | OS_UNX ) -#define COMMAND_PROJECTROOT 0x0000 -#define COMMAND_NMAKE 0x0001 -#define COMMAND_GET 0x0002 -#define COMMAND_USER_START 0x0003 -#define COMMAND_USER_END 0xFFFE -#define COMMAND_ALLDIRS 0xFFFF +#define COMMAND_PROJECTROOT 0x0000 +#define COMMAND_NMAKE 0x0001 +#define COMMAND_GET 0x0002 +#define COMMAND_USER_START 0x0003 +#define COMMAND_USER_END 0xFFFE +#define COMMAND_ALLDIRS 0xFFFF class SByteStringList; class GenericInformationList; @@ -53,129 +53,129 @@ class GenericInformationList; /* // Pfade auf Konfigurationsdateien des Build-Servers -#define REQUEST_DIR \\src\data4\source\b_server\server\newjob +#define REQUEST_DIR \\src\data4\source\b_server\server\newjob */ /********************************************************************* * -* Die Klasse CommandData haelte alle Informationen, die fuer die -* Abarbeitung eines Kommandos (nmake, get) noetig sind +* Die Klasse CommandData haelte alle Informationen, die fuer die +* Abarbeitung eines Kommandos (nmake, get) noetig sind * *********************************************************************/ class CommandData { - ByteString aPrj; - ByteString aLogFileName; - ByteString aInpath; - ByteString aUpd; - ByteString aUpdMinor; - ByteString aProduct; - ByteString aCommand; - ByteString aPath; - ByteString aPrePath; - ByteString aPreFix; - ByteString aCommandPara; - ByteString aComment; - ByteString sClientRestriction; - SByteStringList *pDepList; - USHORT nOSType; - USHORT nCommand; - - ULONG nDepth; // Tiefe der Abhaenigkeit + ByteString aPrj; + ByteString aLogFileName; + ByteString aInpath; + ByteString aUpd; + ByteString aUpdMinor; + ByteString aProduct; + ByteString aCommand; + ByteString aPath; + ByteString aPrePath; + ByteString aPreFix; + ByteString aCommandPara; + ByteString aComment; + ByteString sClientRestriction; + SByteStringList *pDepList; + USHORT nOSType; + USHORT nCommand; + + ULONG nDepth; // Tiefe der Abhaenigkeit public: CommandData(); ~CommandData(); - ByteString GetProjectName(){return aPrj;} - void SetProjectName( ByteString aName ){aPrj = aName;} - ByteString GetLogFile(){return aLogFileName;} - void SetLogFile( ByteString aName ){aLogFileName = aName;} - ByteString GetInpath(){return aInpath;} - void SetInpath( ByteString aName ){aInpath = aName;} - ByteString GetUpd(){return aUpd;} - void SetUpd( ByteString aName ){aUpd = aName;} - ByteString GetUpdMinor(){return aUpdMinor;} - void SetUpdMinor( ByteString aName ){aUpdMinor = aName;} - ByteString GetProduct(){return aProduct;} - void SetProduct( ByteString aName ){aProduct = aName;} - ByteString GetCommand(){return aCommand;} - void SetCommand ( ByteString aName ){aCommand = aName;} - ByteString GetCommandPara(){return aCommandPara;} - void SetCommandPara ( ByteString aName ){aCommandPara = aName;} - ByteString GetComment(){return aComment;} - void SetComment ( ByteString aCommentString ){aComment = aCommentString;} - ByteString GetPath(){return aPath;} - void SetPath( ByteString aName ){aPath = aName;} - ByteString GetPrePath(){return aPrePath;} - void SetPrePath( ByteString aName ){aPrePath = aName;} - USHORT GetOSType(){return nOSType;} - ByteString GetOSTypeString(); - void SetOSType( USHORT nType ){nOSType = nType;} - USHORT GetCommandType(){return nCommand;} - ByteString GetCommandTypeString(); - void SetCommandType( USHORT nCommandType ){nCommand = nCommandType;} + ByteString GetProjectName(){return aPrj;} + void SetProjectName( ByteString aName ){aPrj = aName;} + ByteString GetLogFile(){return aLogFileName;} + void SetLogFile( ByteString aName ){aLogFileName = aName;} + ByteString GetInpath(){return aInpath;} + void SetInpath( ByteString aName ){aInpath = aName;} + ByteString GetUpd(){return aUpd;} + void SetUpd( ByteString aName ){aUpd = aName;} + ByteString GetUpdMinor(){return aUpdMinor;} + void SetUpdMinor( ByteString aName ){aUpdMinor = aName;} + ByteString GetProduct(){return aProduct;} + void SetProduct( ByteString aName ){aProduct = aName;} + ByteString GetCommand(){return aCommand;} + void SetCommand ( ByteString aName ){aCommand = aName;} + ByteString GetCommandPara(){return aCommandPara;} + void SetCommandPara ( ByteString aName ){aCommandPara = aName;} + ByteString GetComment(){return aComment;} + void SetComment ( ByteString aCommentString ){aComment = aCommentString;} + ByteString GetPath(){return aPath;} + void SetPath( ByteString aName ){aPath = aName;} + ByteString GetPrePath(){return aPrePath;} + void SetPrePath( ByteString aName ){aPrePath = aName;} + USHORT GetOSType(){return nOSType;} + ByteString GetOSTypeString(); + void SetOSType( USHORT nType ){nOSType = nType;} + USHORT GetCommandType(){return nCommand;} + ByteString GetCommandTypeString(); + void SetCommandType( USHORT nCommandType ){nCommand = nCommandType;} SByteStringList* GetDependencies(){return pDepList;} - void SetDependencies( SByteStringList *pList ){pDepList = pList;} - ByteString GetClientRestriction() { return sClientRestriction; } - void SetClientRestriction( ByteString sRestriction ) { sClientRestriction = sRestriction; } + void SetDependencies( SByteStringList *pList ){pDepList = pList;} + ByteString GetClientRestriction() { return sClientRestriction; } + void SetClientRestriction( ByteString sRestriction ) { sClientRestriction = sRestriction; } - void AddDepth(){nDepth++;} - ULONG GetDepth(){return nDepth;} + void AddDepth(){nDepth++;} + ULONG GetDepth(){return nDepth;} }; /********************************************************************* * -* Die Klasse SimpleConfig kann benutzt werden, um aus einer Textdatei -* alle Tokens zu lesen +* Die Klasse SimpleConfig kann benutzt werden, um aus einer Textdatei +* alle Tokens zu lesen * *********************************************************************/ class SimpleConfig { - long nLine; - String aFileName; - SvFileStream aFileStream; - ByteString aTmpStr; - ByteString aStringBuffer; + long nLine; + String aFileName; + SvFileStream aFileStream; + ByteString aTmpStr; + ByteString aStringBuffer; - ByteString GetNextLine(); + ByteString GetNextLine(); public: SimpleConfig(String aSimpleConfigFileName); SimpleConfig(DirEntry& rDirEntry); ~SimpleConfig(); - ByteString GetNext(); - ByteString GetCleanedNextLine( BOOL bReadComments = FALSE ); + ByteString GetNext(); + ByteString GetCleanedNextLine( BOOL bReadComments = FALSE ); }; -#define ENV_GUI 0x00000000 -#define ENV_OS 0x00000001 -#define ENV_UPD 0x00000002 -#define ENV_UPDMIN 0x00000004 -#define ENV_INPATH 0x00000008 +#define ENV_GUI 0x00000000 +#define ENV_OS 0x00000001 +#define ENV_UPD 0x00000002 +#define ENV_UPDMIN 0x00000004 +#define ENV_INPATH 0x00000008 #define ENV_OUTPATH 0x00000010 #define ENV_GUIBASE 0x00000020 -#define ENV_CVER 0x00000040 -#define ENV_GVER 0x00000080 -#define ENV_GUIENV 0x00000100 -#define ENV_CPU 0x00000200 +#define ENV_CVER 0x00000040 +#define ENV_GVER 0x00000080 +#define ENV_GUIENV 0x00000100 +#define ENV_CPU 0x00000200 #define ENV_CPUNAME 0x00000400 #define ENV_DLLSUFF 0x00000800 -#define ENV_COMEX 0x00001000 +#define ENV_COMEX 0x00001000 #define ENV_COMPATH 0x00002000 #define ENV_INCLUDE 0x00004000 -#define ENV_LIB 0x00008000 -#define ENV_PATH 0x00010000 -#define ENV_SOLVER 0x00020000 -#define ENV_SOLENV 0x00040000 +#define ENV_LIB 0x00008000 +#define ENV_PATH 0x00010000 +#define ENV_SOLVER 0x00020000 +#define ENV_SOLENV 0x00040000 #define ENV_SOLROOT 0x00080000 #define ENV_DEVROOT 0x00100000 -#define ENV_EMERG 0x00200000 -#define ENV_STAND 0x00400000 +#define ENV_EMERG 0x00200000 +#define ENV_STAND 0x00400000 /********************************************************************* * -* class Prj -* alle Daten eines Projektes werden hier gehalten +* class Prj +* alle Daten eines Projektes werden hier gehalten * *********************************************************************/ @@ -186,53 +186,53 @@ class Prj : public PrjList { friend class Star; private: - BOOL bVisited; + BOOL bVisited; - ByteString aPrjPath; - ByteString aProjectName; - ByteString aProjectPrefix; // max. 2-buchstabige Abk. - SByteStringList* pPrjInitialDepList; - SByteStringList* pPrjDepList; - BOOL bHardDependencies; - BOOL bSorted; + ByteString aPrjPath; + ByteString aProjectName; + ByteString aProjectPrefix; // max. 2-buchstabige Abk. + SByteStringList* pPrjInitialDepList; + SByteStringList* pPrjDepList; + BOOL bHardDependencies; + BOOL bSorted; public: Prj(); Prj( ByteString aName ); ~Prj(); - void SetPreFix( ByteString aPre ){aProjectPrefix = aPre;} - ByteString GetPreFix(){return aProjectPrefix;} - ByteString GetProjectName() + void SetPreFix( ByteString aPre ){aProjectPrefix = aPre;} + ByteString GetPreFix(){return aProjectPrefix;} + ByteString GetProjectName() {return aProjectName;} - void SetProjectName(ByteString aName) + void SetProjectName(ByteString aName) {aProjectName = aName;} - BOOL InsertDirectory( ByteString aDirName , USHORT aWhat, + BOOL InsertDirectory( ByteString aDirName , USHORT aWhat, USHORT aWhatOS, ByteString aLogFileName, const ByteString &rClientRestriction ); - CommandData* RemoveDirectory( ByteString aLogFileName ); - CommandData* GetDirectoryList ( USHORT nWhatOs, USHORT nCommand ); - CommandData* GetDirectoryData( ByteString aLogFileName ); - inline CommandData* GetData( ByteString aLogFileName ) + CommandData* RemoveDirectory( ByteString aLogFileName ); + CommandData* GetDirectoryList ( USHORT nWhatOs, USHORT nCommand ); + CommandData* GetDirectoryData( ByteString aLogFileName ); + inline CommandData* GetData( ByteString aLogFileName ) { return GetDirectoryData( aLogFileName ); }; - SByteStringList* GetDependencies( BOOL bExpanded = TRUE ); - void AddDependencies( ByteString aStr ); - void HasHardDependencies( BOOL bHard ) { bHardDependencies = bHard; } - BOOL HasHardDependencies() { return bHardDependencies; } + SByteStringList* GetDependencies( BOOL bExpanded = TRUE ); + void AddDependencies( ByteString aStr ); + void HasHardDependencies( BOOL bHard ) { bHardDependencies = bHard; } + BOOL HasHardDependencies() { return bHardDependencies; } }; /********************************************************************* * -* class Star -* Diese Klasse liest die Projectstruktur aller StarDivision Projekte -* aus \\dev\data1\upenv\data\config\solar.lst aus +* class Star +* Diese Klasse liest die Projectstruktur aller StarDivision Projekte +* aus \\dev\data1\upenv\data\config\solar.lst aus * *********************************************************************/ DECL_DEST_LIST ( StarList_tmp, StarList, Prj* ) DECLARE_LIST ( SolarFileList, String* ) -class StarFile +class StarFile { private: String aFileName; @@ -253,33 +253,33 @@ public: DECLARE_LIST( StarFileList, StarFile * ) -#define STAR_MODE_SINGLE_PARSE 0x0000 -#define STAR_MODE_RECURSIVE_PARSE 0x0001 -#define STAR_MODE_MULTIPLE_PARSE 0x0002 +#define STAR_MODE_SINGLE_PARSE 0x0000 +#define STAR_MODE_RECURSIVE_PARSE 0x0001 +#define STAR_MODE_MULTIPLE_PARSE 0x0002 class Star : public StarList { private: - ByteString aStarName; + ByteString aStarName; static Link aDBNotFoundHdl; protected: NAMESPACE_VOS( OMutex ) aMutex; - USHORT nStarMode; - SolarFileList aFileList; - StarFileList aLoadedFilesList; - String sSourceRoot; + USHORT nStarMode; + SolarFileList aFileList; + StarFileList aLoadedFilesList; + String sSourceRoot; void InsertSolarList( String sProject ); String CreateFileName( String sProject ); - void Expand_Impl(); - void ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj ); + void Expand_Impl(); + void ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj ); private: - void Read( String &rFileName ); - void Read( SolarFileList *pSOlarFiles ); + void Read( String &rFileName ); + void Read( SolarFileList *pSOlarFiles ); public: Star(); @@ -290,24 +290,24 @@ public: ~Star(); - static void SetDBNotFoundHdl( const Link &rLink ) { aDBNotFoundHdl = rLink; } + static void SetDBNotFoundHdl( const Link &rLink ) { aDBNotFoundHdl = rLink; } - ByteString GetName(){ return aStarName; }; + ByteString GetName(){ return aStarName; }; - BOOL HasProject( ByteString aProjectName ); - Prj* GetPrj( ByteString aProjectName ); - ByteString GetPrjName( DirEntry &rPath ); + BOOL HasProject( ByteString aProjectName ); + Prj* GetPrj( ByteString aProjectName ); + ByteString GetPrjName( DirEntry &rPath ); - void InsertToken( char *pChar ); - BOOL NeedsUpdate(); + void InsertToken( char *pChar ); + BOOL NeedsUpdate(); - USHORT GetMode() { return nStarMode; } + USHORT GetMode() { return nStarMode; } }; class StarWriter : public Star { private: - USHORT WritePrj( Prj *pPrj, SvFileStream& rStream ); + USHORT WritePrj( Prj *pPrj, SvFileStream& rStream ); public: StarWriter( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE ); @@ -315,17 +315,17 @@ public: StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE, const char *pSourceRoot = NULL ); - void CleanUp(); + void CleanUp(); - BOOL InsertProject ( Prj* pNewPrj ); - Prj* RemoveProject ( ByteString aProjectName ); + BOOL InsertProject ( Prj* pNewPrj ); + Prj* RemoveProject ( ByteString aProjectName ); - USHORT Read( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - USHORT Read( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE ); - USHORT Write( String aFileName ); - USHORT WriteMultiple( String rSourceRoot ); + USHORT Read( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE ); + USHORT Read( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE ); + USHORT Write( String aFileName ); + USHORT WriteMultiple( String rSourceRoot ); - void InsertTokenLine( ByteString& rString ); + void InsertTokenLine( ByteString& rString ); }; #endif diff --git a/tools/inc/bootstrp/sstring.hxx b/tools/inc/bootstrp/sstring.hxx index 6fdb52385225..933770887e37 100644 --- a/tools/inc/bootstrp/sstring.hxx +++ b/tools/inc/bootstrp/sstring.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,10 +31,10 @@ #include <tools/string.hxx> #include <tools/list.hxx> -#define NOT_THERE LIST_ENTRY_NOTFOUND +#define NOT_THERE LIST_ENTRY_NOTFOUND -#define SStringList SUniStringList -#define StringList UniStringList +#define SStringList SUniStringList +#define StringList UniStringList DECLARE_LIST( ByteStringList, ByteString* ) DECLARE_LIST( UniStringList, UniString* ) @@ -52,17 +52,17 @@ public: ~SByteStringList(); // neuen ByteString in Liste einfuegen - ULONG PutString( ByteString* ); - ByteString* RemoveString( const ByteString& rName ); + ULONG PutString( ByteString* ); + ByteString* RemoveString( const ByteString& rName ); // Position des ByteString in Liste, wenn nicht enthalten, dann // return = NOT_THERE - ULONG IsString( ByteString* ); + ULONG IsString( ByteString* ); // Vorgaenger ermitteln ( auch wenn selbst noch nicht in // Liste enthalten - ULONG GetPrevString( ByteString* ); - void CleanUp(); + ULONG GetPrevString( ByteString* ); + void CleanUp(); SByteStringList& operator<< ( SvStream& rStream ); SByteStringList& operator>> ( SvStream& rStream ); @@ -79,27 +79,27 @@ public: ~SUniStringList(); // neuen UniString in Liste einfuegen - ULONG PutString( UniString* ); - UniString* RemoveString( const UniString& rName ); + ULONG PutString( UniString* ); + UniString* RemoveString( const UniString& rName ); // Position des UniString in Liste, wenn nicht enthalten, dann // return = NOT_THERE - ULONG IsString( UniString* ); + ULONG IsString( UniString* ); // Vorgaenger ermitteln ( auch wenn selbst noch nicht in // Liste enthalten - ULONG GetPrevString( UniString* ); + ULONG GetPrevString( UniString* ); }; class Text { protected: - String aString; + String aString; public: Text( char* pChar ); Text( String &rStr ) { aString = rStr; } - void Stderr(); + void Stderr(); }; #endif diff --git a/tools/inc/impcont.hxx b/tools/inc/impcont.hxx index 244c255d2d98..224d5a4429ef 100644 --- a/tools/inc/impcont.hxx +++ b/tools/inc/impcont.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/impstrg.hxx b/tools/inc/impstrg.hxx index 15d914ac84e2..60b25a4c3fd6 100644 --- a/tools/inc/impstrg.hxx +++ b/tools/inc/impstrg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/pch/precompiled_tools.cxx b/tools/inc/pch/precompiled_tools.cxx index 29db7a72c0e3..cafe6444a55d 100644 --- a/tools/inc/pch/precompiled_tools.cxx +++ b/tools/inc/pch/precompiled_tools.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/pch/precompiled_tools.hxx b/tools/inc/pch/precompiled_tools.hxx index 512634020f17..2bc615738a08 100644 --- a/tools/inc/pch/precompiled_tools.hxx +++ b/tools/inc/pch/precompiled_tools.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/poly.h b/tools/inc/poly.h index fbb00377529f..e6678e071f28 100644 --- a/tools/inc/poly.h +++ b/tools/inc/poly.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/StringListResource.hxx b/tools/inc/tools/StringListResource.hxx index 07f31defba81..9709435407fb 100644 --- a/tools/inc/tools/StringListResource.hxx +++ b/tools/inc/tools/StringListResource.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/agapi.hxx b/tools/inc/tools/agapi.hxx index 9e86bad3acab..9c71bd35c6cc 100644 --- a/tools/inc/tools/agapi.hxx +++ b/tools/inc/tools/agapi.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,27 +40,27 @@ class AgentApi protected: friend class ChannelList; - AgentItem* pChannelAgent; - virtual BOOL StartAgent() = 0; + AgentItem* pChannelAgent; + virtual BOOL StartAgent() = 0; AgentApi(AgentItem* pAgent) { pChannelAgent = pAgent; } public: virtual ~AgentApi() {} - virtual void InitAgent() = 0; - virtual void ShutDownAgent() = 0; + virtual void InitAgent() = 0; + virtual void ShutDownAgent() = 0; - virtual BOOL NewDataPermission(const String& rChannelName) = 0; - virtual void NewData(const String& rChannelName, + virtual BOOL NewDataPermission(const String& rChannelName) = 0; + virtual void NewData(const String& rChannelName, const INetURLObject& rURL) = 0; - virtual void NotifyChannelObjFile(const INetURLObject& rURL, + virtual void NotifyChannelObjFile(const INetURLObject& rURL, const String& rFileName) = 0; - virtual void NotifyChannelObjData(const INetURLObject& rURL, + virtual void NotifyChannelObjData(const INetURLObject& rURL, void* pBuffer, long nOffset, long nLen, long nTotalLen) = 0; - virtual void RegisterChannels() = 0; - virtual void RegisterUpdateTransmitter() = 0; + virtual void RegisterChannels() = 0; + virtual void RegisterUpdateTransmitter() = 0; }; #endif //_AGAPI_HXX diff --git a/tools/inc/tools/agitem.hxx b/tools/inc/tools/agitem.hxx index 774f86a69ebb..3177bdffa0a8 100644 --- a/tools/inc/tools/agitem.hxx +++ b/tools/inc/tools/agitem.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,13 +38,13 @@ class ChApi; class AgentItem { public: - virtual const String& GetChAgentName() const = 0; - virtual const INetURLObject& GetLocation() const = 0; - virtual AgentApi* GetApi() const = 0; - virtual ChApi* GetChApi() const = 0; + virtual const String& GetChAgentName() const = 0; + virtual const INetURLObject& GetLocation() const = 0; + virtual AgentApi* GetApi() const = 0; + virtual ChApi* GetChApi() const = 0; - virtual void SetIsActive(BOOL bNew) = 0; - virtual BOOL IsActive() const = 0; + virtual void SetIsActive(BOOL bNew) = 0; + virtual BOOL IsActive() const = 0; }; #endif //_AGITEM_HXX diff --git a/tools/inc/tools/appendunixshellword.hxx b/tools/inc/tools/appendunixshellword.hxx index 31c698e6dd8e..66b333bb62a5 100644 --- a/tools/inc/tools/appendunixshellword.hxx +++ b/tools/inc/tools/appendunixshellword.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/b3dtrans.hxx b/tools/inc/tools/b3dtrans.hxx index 4df6e7a9df85..5b812bde15a2 100644 --- a/tools/inc/tools/b3dtrans.hxx +++ b/tools/inc/tools/b3dtrans.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define _B3D_B3DTRANS_HXX // Zu verwendender DephRange des Z-Buffers -#define ZBUFFER_DEPTH_RANGE ((double)(256L * 256L * 256L)) +#define ZBUFFER_DEPTH_RANGE ((double)(256L * 256L * 256L)) #include <basegfx/matrix/b3dhommatrix.hxx> #include <basegfx/range/b3drange.hxx> @@ -75,68 +75,68 @@ class TOOLS_DLLPUBLIC B3dTransformationSet { private: // Object Matrix Object -> World - basegfx::B3DHomMatrix maObjectTrans; - basegfx::B3DHomMatrix maInvObjectTrans; + basegfx::B3DHomMatrix maObjectTrans; + basegfx::B3DHomMatrix maInvObjectTrans; // Orientation Matrix - basegfx::B3DHomMatrix maOrientation; - basegfx::B3DHomMatrix maInvOrientation; + basegfx::B3DHomMatrix maOrientation; + basegfx::B3DHomMatrix maInvOrientation; // Projection Matrix - basegfx::B3DHomMatrix maProjection; - basegfx::B3DHomMatrix maInvProjection; + basegfx::B3DHomMatrix maProjection; + basegfx::B3DHomMatrix maInvProjection; // Texture Matrices - basegfx::B2DHomMatrix maTexture; + basegfx::B2DHomMatrix maTexture; // Speziell zum Umwandeln von Punkten Objekt -> Device - basegfx::B3DHomMatrix maObjectToDevice; + basegfx::B3DHomMatrix maObjectToDevice; // Transponierte Inverse fuer Vectortransformationen - basegfx::B3DHomMatrix maInvTransObjectToEye; + basegfx::B3DHomMatrix maInvTransObjectToEye; // Transformation World->View - basegfx::B3DHomMatrix maMatFromWorldToView; - basegfx::B3DHomMatrix maInvMatFromWorldToView; + basegfx::B3DHomMatrix maMatFromWorldToView; + basegfx::B3DHomMatrix maInvMatFromWorldToView; // Parameters for ViewportTransformation - basegfx::B3DVector maScale; - basegfx::B3DVector maTranslate; + basegfx::B3DVector maScale; + basegfx::B3DVector maTranslate; // ViewPlane DeviceRectangle (vom Benutzer gesetzt) - double mfLeftBound; - double mfRightBound; - double mfBottomBound; - double mfTopBound; + double mfLeftBound; + double mfRightBound; + double mfBottomBound; + double mfTopBound; // Near and far clipping planes - double mfNearBound; - double mfFarBound; + double mfNearBound; + double mfFarBound; // Seitenverhaeltnis der 3D Abbildung (Y / X) // default ist 1:1 -> 1.0 // Deaktivieren mit 0.0 als Wert - double mfRatio; + double mfRatio; // Der gesetzte Ausgabebereich (in logischen Koordinaten) // und der dazugehoerige sichtbare Bereich - Rectangle maViewportRectangle; - Rectangle maVisibleRectangle; + Rectangle maViewportRectangle; + Rectangle maVisibleRectangle; // Die tatsaechlich von CalcViewport gesetzten Abmessungen // des sichtbaren Bereichs (in logischen Koordinaten) - Rectangle maSetBound; + Rectangle maSetBound; // Methode zur Aufrechterhaltung des Seitenverhaeltnisses // default ist Base3DRatioGrow - Base3DRatio meRatio; + Base3DRatio meRatio; // Flags - unsigned mbPerspective : 1; - unsigned mbWorldToViewValid : 1; - unsigned mbInvTransObjectToEyeValid : 1; - unsigned mbObjectToDeviceValid : 1; - unsigned mbProjectionValid : 1; + unsigned mbPerspective : 1; + unsigned mbWorldToViewValid : 1; + unsigned mbInvTransObjectToEyeValid : 1; + unsigned mbObjectToDeviceValid : 1; + unsigned mbProjectionValid : 1; public: B3dTransformationSet(); @@ -243,8 +243,8 @@ public: double fNear = 0.0, double fFar = 1.0); static void Orientation( basegfx::B3DHomMatrix& rTarget, - basegfx::B3DPoint aVRP = basegfx::B3DPoint(0.0,0.0,1.0), - basegfx::B3DVector aVPN = basegfx::B3DVector(0.0,0.0,1.0), + basegfx::B3DPoint aVRP = basegfx::B3DPoint(0.0,0.0,1.0), + basegfx::B3DVector aVPN = basegfx::B3DVector(0.0,0.0,1.0), basegfx::B3DVector aVUP = basegfx::B3DVector(0.0,1.0,0.0)); protected: @@ -273,9 +273,9 @@ protected: class TOOLS_DLLPUBLIC B3dViewport : public B3dTransformationSet { private: - basegfx::B3DPoint aVRP; // View Reference Point - basegfx::B3DVector aVPN; // View Plane Normal - basegfx::B3DVector aVUV; // View Up Vector + basegfx::B3DPoint aVRP; // View Reference Point + basegfx::B3DVector aVPN; // View Plane Normal + basegfx::B3DVector aVUV; // View Up Vector public: B3dViewport(); @@ -289,9 +289,9 @@ public: const basegfx::B3DVector& rNewVPN, const basegfx::B3DVector& rNewVUV); - const basegfx::B3DPoint& GetVRP() const { return aVRP; } - const basegfx::B3DVector& GetVPN() const { return aVPN; } - const basegfx::B3DVector& GetVUV() const { return aVUV; } + const basegfx::B3DPoint& GetVRP() const { return aVRP; } + const basegfx::B3DVector& GetVPN() const { return aVPN; } + const basegfx::B3DVector& GetVUV() const { return aVUV; } protected: void CalcOrientation(); @@ -306,13 +306,13 @@ protected: class TOOLS_DLLPUBLIC B3dCamera : public B3dViewport { private: - basegfx::B3DPoint aPosition; - basegfx::B3DPoint aCorrectedPosition; - basegfx::B3DVector aLookAt; - double fFocalLength; - double fBankAngle; + basegfx::B3DPoint aPosition; + basegfx::B3DPoint aCorrectedPosition; + basegfx::B3DVector aLookAt; + double fFocalLength; + double fBankAngle; - unsigned bUseFocalLength : 1; + unsigned bUseFocalLength : 1; public: B3dCamera( diff --git a/tools/inc/tools/bigint.hxx b/tools/inc/tools/bigint.hxx index a3154d02f2d7..353fbb063191 100644 --- a/tools/inc/tools/bigint.hxx +++ b/tools/inc/tools/bigint.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/cachestr.hxx b/tools/inc/tools/cachestr.hxx index e3eaa9767913..1819792bb386 100644 --- a/tools/inc/tools/cachestr.hxx +++ b/tools/inc/tools/cachestr.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ private: SvStream* pCurrentStream; TempFile* pTempFile; - Link aFilenameLinkHdl; + Link aFilenameLinkHdl; TOOLS_DLLPRIVATE virtual ULONG GetData( void* pData, ULONG nSize ); TOOLS_DLLPRIVATE virtual ULONG PutData( const void* pData, ULONG nSize ); @@ -64,19 +64,19 @@ public: ULONG nMaxMemSize = 0 ); ~SvCacheStream(); - void SetFilenameHdl( const Link& rLink); + void SetFilenameHdl( const Link& rLink); const Link& GetFilenameHdl() const; - void SetFilename( const String& rFN ) + void SetFilename( const String& rFN ) { aFileName = rFN; } // darf nur vom FilenameHdl gerufen werden! - const String& GetFilename() const { return aFileName; } + const String& GetFilename() const { return aFileName; } void SwapOut(); const void* GetBuffer(); ULONG GetSize(); - BOOL IsPersistent() { return bPersistent != 0; } - void SetPersistence( BOOL b = TRUE ) { bPersistent = b; } - void SetSwapStream( SvStream *p ) + BOOL IsPersistent() { return bPersistent != 0; } + void SetPersistence( BOOL b = TRUE ) { bPersistent = b; } + void SetSwapStream( SvStream *p ) { pSwapStream = p; } // darf nur vom FilenameHdl gerufen werden! }; diff --git a/tools/inc/tools/chapi.hxx b/tools/inc/tools/chapi.hxx index e4d867126a52..0acfe4cb2ca5 100644 --- a/tools/inc/tools/chapi.hxx +++ b/tools/inc/tools/chapi.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,8 +35,8 @@ class INetURLObject; class String; enum RequestType { - REQTYP_LOCAL_FILE = 1, - REQTYP_MEMORY = 2 + REQTYP_LOCAL_FILE = 1, + REQTYP_MEMORY = 2 }; class ChApi @@ -44,22 +44,22 @@ class ChApi public: virtual ~ChApi() {} - virtual void ShutDownAgent() = 0; - virtual void SetLastSuccUpd() = 0; + virtual void ShutDownAgent() = 0; + virtual void SetLastSuccUpd() = 0; - virtual void GetChannelObject( const INetURLObject& rURL, RequestType eStreamType, + virtual void GetChannelObject( const INetURLObject& rURL, RequestType eStreamType, const String& rFileName ) = 0; virtual void AddChannelItem( const String& aChName, const INetURLObject& aTransmitter, const String& aChannel, USHORT nUpdPeriode, const String& rChAgentName ) = 0; virtual void DelChannelItem( const String& aChName ) = 0; - virtual void SetChTransmitter( const String& aChName, const String& rNewVal ) = 0; - virtual void SetChannel( const String& aChName, const String& rNewVal ) = 0; - virtual void SetChannelName( const String& aChName, const String& rNewVal ) = 0; - virtual void SetChUpdPeriode( const String& aChName, USHORT nUpdPeriode ) = 0; - virtual void SetChannelAgentName( const String& aChName, const String& rNewVal ) = 0; + virtual void SetChTransmitter( const String& aChName, const String& rNewVal ) = 0; + virtual void SetChannel( const String& aChName, const String& rNewVal ) = 0; + virtual void SetChannelName( const String& aChName, const String& rNewVal ) = 0; + virtual void SetChUpdPeriode( const String& aChName, USHORT nUpdPeriode ) = 0; + virtual void SetChannelAgentName( const String& aChName, const String& rNewVal ) = 0; - virtual void SetUpdateTransmitter(ChannelAgentItem* pAgent, const INetURLObject& rTransmitter) = 0; + virtual void SetUpdateTransmitter(ChannelAgentItem* pAgent, const INetURLObject& rTransmitter) = 0; }; //////////////////////////////////////////////////////////////////////////////// diff --git a/tools/inc/tools/color.hxx b/tools/inc/tools/color.hxx index aca8f95b3fc1..a99ad1dd11c4 100644 --- a/tools/inc/tools/color.hxx +++ b/tools/inc/tools/color.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,71 +41,71 @@ class ResId; // - ColorCount-Types - // -------------------- -#define COLCOUNT_MONOCHROM ((ULONG)2) -#define COLCOUNT_16 ((ULONG)16) -#define COLCOUNT_256 ((ULONG)256) -#define COLCOUNT_HICOLOR1 (((ULONG)0x00007FFF)+1) -#define COLCOUNT_HICOLOR2 (((ULONG)0x0000FFFF)+1) -#define COLCOUNT_TRUECOLOR (((ULONG)0x00FFFFFF)+1) +#define COLCOUNT_MONOCHROM ((ULONG)2) +#define COLCOUNT_16 ((ULONG)16) +#define COLCOUNT_256 ((ULONG)256) +#define COLCOUNT_HICOLOR1 (((ULONG)0x00007FFF)+1) +#define COLCOUNT_HICOLOR2 (((ULONG)0x0000FFFF)+1) +#define COLCOUNT_TRUECOLOR (((ULONG)0x00FFFFFF)+1) // --------------- // - Color-Types - // --------------- typedef UINT32 ColorData; -#define RGB_COLORDATA( r,g,b ) ((ColorData)(((UINT32)((UINT8)(b))))|(((UINT32)((UINT8)(g)))<<8)|(((UINT32)((UINT8)(r)))<<16)) -#define TRGB_COLORDATA( t,r,g,b ) ((ColorData)(((UINT32)((UINT8)(b))))|(((UINT32)((UINT8)(g)))<<8)|(((UINT32)((UINT8)(r)))<<16)|(((UINT32)((UINT8)(t)))<<24)) -#define COLORDATA_RED( n ) ((UINT8)((n)>>16)) -#define COLORDATA_GREEN( n ) ((UINT8)(((UINT16)(n)) >> 8)) -#define COLORDATA_BLUE( n ) ((UINT8)(n)) +#define RGB_COLORDATA( r,g,b ) ((ColorData)(((UINT32)((UINT8)(b))))|(((UINT32)((UINT8)(g)))<<8)|(((UINT32)((UINT8)(r)))<<16)) +#define TRGB_COLORDATA( t,r,g,b ) ((ColorData)(((UINT32)((UINT8)(b))))|(((UINT32)((UINT8)(g)))<<8)|(((UINT32)((UINT8)(r)))<<16)|(((UINT32)((UINT8)(t)))<<24)) +#define COLORDATA_RED( n ) ((UINT8)((n)>>16)) +#define COLORDATA_GREEN( n ) ((UINT8)(((UINT16)(n)) >> 8)) +#define COLORDATA_BLUE( n ) ((UINT8)(n)) #define COLORDATA_TRANSPARENCY( n ) ((UINT8)((n)>>24)) -#define COLORDATA_RGB( n ) ((ColorData)((n) & 0x00FFFFFF)) - -#define COL_BLACK RGB_COLORDATA( 0x00, 0x00, 0x00 ) -#define COL_BLUE RGB_COLORDATA( 0x00, 0x00, 0x80 ) -#define COL_GREEN RGB_COLORDATA( 0x00, 0x80, 0x00 ) -#define COL_CYAN RGB_COLORDATA( 0x00, 0x80, 0x80 ) -#define COL_RED RGB_COLORDATA( 0x80, 0x00, 0x00 ) -#define COL_MAGENTA RGB_COLORDATA( 0x80, 0x00, 0x80 ) -#define COL_BROWN RGB_COLORDATA( 0x80, 0x80, 0x00 ) -#define COL_GRAY RGB_COLORDATA( 0x80, 0x80, 0x80 ) -#define COL_LIGHTGRAY RGB_COLORDATA( 0xC0, 0xC0, 0xC0 ) -#define COL_LIGHTBLUE RGB_COLORDATA( 0x00, 0x00, 0xFF ) -#define COL_LIGHTGREEN RGB_COLORDATA( 0x00, 0xFF, 0x00 ) -#define COL_LIGHTCYAN RGB_COLORDATA( 0x00, 0xFF, 0xFF ) -#define COL_LIGHTRED RGB_COLORDATA( 0xFF, 0x00, 0x00 ) -#define COL_LIGHTMAGENTA RGB_COLORDATA( 0xFF, 0x00, 0xFF ) -#define COL_YELLOW RGB_COLORDATA( 0xFF, 0xFF, 0x00 ) -#define COL_WHITE RGB_COLORDATA( 0xFF, 0xFF, 0xFF ) -#define COL_TRANSPARENT TRGB_COLORDATA( 0xFF, 0xFF, 0xFF, 0xFF ) +#define COLORDATA_RGB( n ) ((ColorData)((n) & 0x00FFFFFF)) + +#define COL_BLACK RGB_COLORDATA( 0x00, 0x00, 0x00 ) +#define COL_BLUE RGB_COLORDATA( 0x00, 0x00, 0x80 ) +#define COL_GREEN RGB_COLORDATA( 0x00, 0x80, 0x00 ) +#define COL_CYAN RGB_COLORDATA( 0x00, 0x80, 0x80 ) +#define COL_RED RGB_COLORDATA( 0x80, 0x00, 0x00 ) +#define COL_MAGENTA RGB_COLORDATA( 0x80, 0x00, 0x80 ) +#define COL_BROWN RGB_COLORDATA( 0x80, 0x80, 0x00 ) +#define COL_GRAY RGB_COLORDATA( 0x80, 0x80, 0x80 ) +#define COL_LIGHTGRAY RGB_COLORDATA( 0xC0, 0xC0, 0xC0 ) +#define COL_LIGHTBLUE RGB_COLORDATA( 0x00, 0x00, 0xFF ) +#define COL_LIGHTGREEN RGB_COLORDATA( 0x00, 0xFF, 0x00 ) +#define COL_LIGHTCYAN RGB_COLORDATA( 0x00, 0xFF, 0xFF ) +#define COL_LIGHTRED RGB_COLORDATA( 0xFF, 0x00, 0x00 ) +#define COL_LIGHTMAGENTA RGB_COLORDATA( 0xFF, 0x00, 0xFF ) +#define COL_YELLOW RGB_COLORDATA( 0xFF, 0xFF, 0x00 ) +#define COL_WHITE RGB_COLORDATA( 0xFF, 0xFF, 0xFF ) +#define COL_TRANSPARENT TRGB_COLORDATA( 0xFF, 0xFF, 0xFF, 0xFF ) #define COL_AUTO (ColorData)0xFFFFFFFF -#define COL_AUTHOR1_DARK RGB_COLORDATA(198, 146, 0) -#define COL_AUTHOR1_NORMAL RGB_COLORDATA(255, 255, 158) -#define COL_AUTHOR1_LIGHT RGB_COLORDATA(255, 255, 195) -#define COL_AUTHOR2_DARK RGB_COLORDATA(6, 70, 162) -#define COL_AUTHOR2_NORMAL RGB_COLORDATA(216, 232, 255) -#define COL_AUTHOR2_LIGHT RGB_COLORDATA(233, 242, 255) -#define COL_AUTHOR3_DARK RGB_COLORDATA(87, 157, 28) -#define COL_AUTHOR3_NORMAL RGB_COLORDATA(218, 248, 193) -#define COL_AUTHOR3_LIGHT RGB_COLORDATA(226, 250, 207) -#define COL_AUTHOR4_DARK RGB_COLORDATA(105, 43, 157) -#define COL_AUTHOR4_NORMAL RGB_COLORDATA(228, 210, 245) -#define COL_AUTHOR4_LIGHT RGB_COLORDATA(239, 228, 248) -#define COL_AUTHOR5_DARK RGB_COLORDATA(197, 0, 11) -#define COL_AUTHOR5_NORMAL RGB_COLORDATA(254, 205, 208) -#define COL_AUTHOR5_LIGHT RGB_COLORDATA(255, 227, 229) -#define COL_AUTHOR6_DARK RGB_COLORDATA(0, 128, 128) -#define COL_AUTHOR6_NORMAL RGB_COLORDATA(210, 246, 246) -#define COL_AUTHOR6_LIGHT RGB_COLORDATA(230, 250, 250) -#define COL_AUTHOR7_DARK RGB_COLORDATA(140, 132, 0) -#define COL_AUTHOR7_NORMAL RGB_COLORDATA(237, 252, 163) -#define COL_AUTHOR7_LIGHT RGB_COLORDATA(242, 254, 181) -#define COL_AUTHOR8_DARK RGB_COLORDATA(53, 85, 107) -#define COL_AUTHOR8_NORMAL RGB_COLORDATA(211, 222, 232) -#define COL_AUTHOR8_LIGHT RGB_COLORDATA(226, 234, 241) -#define COL_AUTHOR9_DARK RGB_COLORDATA(209, 118, 0) -#define COL_AUTHOR9_NORMAL RGB_COLORDATA(255, 226, 185) -#define COL_AUTHOR9_LIGHT RGB_COLORDATA(255, 231, 199) +#define COL_AUTHOR1_DARK RGB_COLORDATA(198, 146, 0) +#define COL_AUTHOR1_NORMAL RGB_COLORDATA(255, 255, 158) +#define COL_AUTHOR1_LIGHT RGB_COLORDATA(255, 255, 195) +#define COL_AUTHOR2_DARK RGB_COLORDATA(6, 70, 162) +#define COL_AUTHOR2_NORMAL RGB_COLORDATA(216, 232, 255) +#define COL_AUTHOR2_LIGHT RGB_COLORDATA(233, 242, 255) +#define COL_AUTHOR3_DARK RGB_COLORDATA(87, 157, 28) +#define COL_AUTHOR3_NORMAL RGB_COLORDATA(218, 248, 193) +#define COL_AUTHOR3_LIGHT RGB_COLORDATA(226, 250, 207) +#define COL_AUTHOR4_DARK RGB_COLORDATA(105, 43, 157) +#define COL_AUTHOR4_NORMAL RGB_COLORDATA(228, 210, 245) +#define COL_AUTHOR4_LIGHT RGB_COLORDATA(239, 228, 248) +#define COL_AUTHOR5_DARK RGB_COLORDATA(197, 0, 11) +#define COL_AUTHOR5_NORMAL RGB_COLORDATA(254, 205, 208) +#define COL_AUTHOR5_LIGHT RGB_COLORDATA(255, 227, 229) +#define COL_AUTHOR6_DARK RGB_COLORDATA(0, 128, 128) +#define COL_AUTHOR6_NORMAL RGB_COLORDATA(210, 246, 246) +#define COL_AUTHOR6_LIGHT RGB_COLORDATA(230, 250, 250) +#define COL_AUTHOR7_DARK RGB_COLORDATA(140, 132, 0) +#define COL_AUTHOR7_NORMAL RGB_COLORDATA(237, 252, 163) +#define COL_AUTHOR7_LIGHT RGB_COLORDATA(242, 254, 181) +#define COL_AUTHOR8_DARK RGB_COLORDATA(53, 85, 107) +#define COL_AUTHOR8_NORMAL RGB_COLORDATA(211, 222, 232) +#define COL_AUTHOR8_LIGHT RGB_COLORDATA(226, 234, 241) +#define COL_AUTHOR9_DARK RGB_COLORDATA(209, 118, 0) +#define COL_AUTHOR9_NORMAL RGB_COLORDATA(255, 226, 185) +#define COL_AUTHOR9_LIGHT RGB_COLORDATA(255, 231, 199) #define COLOR_CHANNEL_MERGE( _def_cDst, _def_cSrc, _def_cSrcTrans ) \ ((BYTE)((((long)(_def_cDst)-(_def_cSrc))*(_def_cSrcTrans)+(((_def_cSrc)<<8L)|(_def_cDst)))>>8L)) @@ -117,7 +117,7 @@ typedef UINT32 ColorData; class TOOLS_DLLPUBLIC Color { protected: - ColorData mnColor; + ColorData mnColor; public: Color() { mnColor = COL_BLACK; } @@ -130,41 +130,41 @@ public: // This ctor is defined in svtools, not tools! // constructor to create a tools-Color from ::basegfx::BColor - explicit Color(const ::basegfx::BColor& rBColor) - { - mnColor = RGB_COLORDATA( - UINT8((rBColor.getRed() * 255.0) + 0.5), - UINT8((rBColor.getGreen() * 255.0) + 0.5), + explicit Color(const ::basegfx::BColor& rBColor) + { + mnColor = RGB_COLORDATA( + UINT8((rBColor.getRed() * 255.0) + 0.5), + UINT8((rBColor.getGreen() * 255.0) + 0.5), UINT8((rBColor.getBlue() * 255.0) + 0.5)); } - void SetRed( UINT8 nRed ); - UINT8 GetRed() const { return COLORDATA_RED( mnColor ); } - void SetGreen( UINT8 nGreen ); - UINT8 GetGreen() const { return COLORDATA_GREEN( mnColor ); } - void SetBlue( UINT8 nBlue ); - UINT8 GetBlue() const { return COLORDATA_BLUE( mnColor ); } - void SetTransparency( UINT8 nTransparency ); - UINT8 GetTransparency() const { return COLORDATA_TRANSPARENCY( mnColor ); } + void SetRed( UINT8 nRed ); + UINT8 GetRed() const { return COLORDATA_RED( mnColor ); } + void SetGreen( UINT8 nGreen ); + UINT8 GetGreen() const { return COLORDATA_GREEN( mnColor ); } + void SetBlue( UINT8 nBlue ); + UINT8 GetBlue() const { return COLORDATA_BLUE( mnColor ); } + void SetTransparency( UINT8 nTransparency ); + UINT8 GetTransparency() const { return COLORDATA_TRANSPARENCY( mnColor ); } - void SetColor( ColorData nColor ) { mnColor = nColor; } - ColorData GetColor() const { return mnColor; } - ColorData GetRGBColor() const { return COLORDATA_RGB( mnColor ); } + void SetColor( ColorData nColor ) { mnColor = nColor; } + ColorData GetColor() const { return mnColor; } + ColorData GetRGBColor() const { return COLORDATA_RGB( mnColor ); } - UINT8 GetColorError( const Color& rCompareColor ) const; + UINT8 GetColorError( const Color& rCompareColor ) const; - UINT8 GetLuminance() const; - void IncreaseLuminance( UINT8 cLumInc ); - void DecreaseLuminance( UINT8 cLumDec ); + UINT8 GetLuminance() const; + void IncreaseLuminance( UINT8 cLumInc ); + void DecreaseLuminance( UINT8 cLumDec ); - void IncreaseContrast( UINT8 cContInc ); - void DecreaseContrast( UINT8 cContDec ); + void IncreaseContrast( UINT8 cContInc ); + void DecreaseContrast( UINT8 cContDec ); - void Invert(); + void Invert(); - void Merge( const Color& rMergeColor, BYTE cTransparency ); + void Merge( const Color& rMergeColor, BYTE cTransparency ); - BOOL IsRGBEqual( const Color& rColor ) const; + BOOL IsRGBEqual( const Color& rColor ) const; // comparison with luminance thresholds BOOL IsDark() const; @@ -178,16 +178,16 @@ public: static ColorData HSBtoRGB( USHORT nHue, USHORT nSat, USHORT nBri ); void RGBtoHSB( USHORT& nHue, USHORT& nSat, USHORT& nBri ) const; - BOOL operator==( const Color& rColor ) const + BOOL operator==( const Color& rColor ) const { return (mnColor == rColor.mnColor); } - BOOL operator!=( const Color& rColor ) const + BOOL operator!=( const Color& rColor ) const { return !(Color::operator==( rColor )); } - SvStream& Read( SvStream& rIStm, BOOL bNewFormat = TRUE ); - SvStream& Write( SvStream& rOStm, BOOL bNewFormat = TRUE ); + SvStream& Read( SvStream& rIStm, BOOL bNewFormat = TRUE ); + SvStream& Write( SvStream& rOStm, BOOL bNewFormat = TRUE ); - TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Color& rColor ); - TOOLS_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStream, const Color& rColor ); + TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Color& rColor ); + TOOLS_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStream, const Color& rColor ); // get ::basegfx::BColor from this color ::basegfx::BColor getBColor() const { return ::basegfx::BColor(GetRed() / 255.0, GetGreen() / 255.0, GetBlue() / 255.0); } diff --git a/tools/inc/tools/config.hxx b/tools/inc/tools/config.hxx index 95977ea456fd..cb64cc2ec5bd 100644 --- a/tools/inc/tools/config.hxx +++ b/tools/inc/tools/config.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,18 +40,18 @@ struct ImplGroupData; class TOOLS_DLLPUBLIC Config { private: - XubString maFileName; - ByteString maGroupName; - ImplConfigData* mpData; - ImplGroupData* mpActGroup; - ULONG mnDataUpdateId; - USHORT mnLockCount; - BOOL mbPersistence; - BOOL mbDummy1; + XubString maFileName; + ByteString maGroupName; + ImplConfigData* mpData; + ImplGroupData* mpActGroup; + ULONG mnDataUpdateId; + USHORT mnLockCount; + BOOL mbPersistence; + BOOL mbDummy1; #ifdef _CONFIG_CXX - TOOLS_DLLPRIVATE BOOL ImplUpdateConfig() const; - TOOLS_DLLPRIVATE ImplGroupData* ImplGetGroup() const; + TOOLS_DLLPRIVATE BOOL ImplUpdateConfig() const; + TOOLS_DLLPRIVATE ImplGroupData* ImplGetGroup() const; #endif public: @@ -59,43 +59,43 @@ public: Config( const XubString& rFileName ); ~Config(); - const XubString& GetPathName() const { return maFileName; } - static XubString GetDefDirectory(); - static XubString GetConfigName( const XubString& rPath, const XubString& rBaseName ); + const XubString& GetPathName() const { return maFileName; } + static XubString GetDefDirectory(); + static XubString GetConfigName( const XubString& rPath, const XubString& rBaseName ); - void SetGroup( const ByteString& rGroup ); - const ByteString& GetGroup() const { return maGroupName; } - void DeleteGroup( const ByteString& rGroup ); - ByteString GetGroupName( USHORT nGroup ) const; - USHORT GetGroupCount() const; - BOOL HasGroup( const ByteString& rGroup ) const; + void SetGroup( const ByteString& rGroup ); + const ByteString& GetGroup() const { return maGroupName; } + void DeleteGroup( const ByteString& rGroup ); + ByteString GetGroupName( USHORT nGroup ) const; + USHORT GetGroupCount() const; + BOOL HasGroup( const ByteString& rGroup ) const; - ByteString ReadKey( const ByteString& rKey ) const; - UniString ReadKey( const ByteString& rKey, rtl_TextEncoding eEncoding ) const; - ByteString ReadKey( const ByteString& rKey, const ByteString& rDefault ) const; - void WriteKey( const ByteString& rKey, const ByteString& rValue ); - void WriteKey( const ByteString& rKey, const UniString& rValue, rtl_TextEncoding eEncoding ); - void DeleteKey( const ByteString& rKey ); - ByteString GetKeyName( USHORT nKey ) const; - ByteString ReadKey( USHORT nKey ) const; - USHORT GetKeyCount() const; + ByteString ReadKey( const ByteString& rKey ) const; + UniString ReadKey( const ByteString& rKey, rtl_TextEncoding eEncoding ) const; + ByteString ReadKey( const ByteString& rKey, const ByteString& rDefault ) const; + void WriteKey( const ByteString& rKey, const ByteString& rValue ); + void WriteKey( const ByteString& rKey, const UniString& rValue, rtl_TextEncoding eEncoding ); + void DeleteKey( const ByteString& rKey ); + ByteString GetKeyName( USHORT nKey ) const; + ByteString ReadKey( USHORT nKey ) const; + USHORT GetKeyCount() const; - void EnterLock(); - void LeaveLock(); - BOOL IsLocked() const { return (mnLockCount != 0); } - BOOL Update(); - void Flush(); + void EnterLock(); + void LeaveLock(); + BOOL IsLocked() const { return (mnLockCount != 0); } + BOOL Update(); + void Flush(); - void EnablePersistence( BOOL bPersistence = TRUE ) + void EnablePersistence( BOOL bPersistence = TRUE ) { mbPersistence = bPersistence; } - BOOL IsPersistenceEnabled() const { return mbPersistence; } + BOOL IsPersistenceEnabled() const { return mbPersistence; } - void SetLineEnd( LineEnd eLineEnd ); - LineEnd GetLineEnd() const; + void SetLineEnd( LineEnd eLineEnd ); + LineEnd GetLineEnd() const; private: - TOOLS_DLLPRIVATE Config( const Config& rConfig ); - TOOLS_DLLPRIVATE Config& operator = ( const Config& rConfig ); + TOOLS_DLLPRIVATE Config( const Config& rConfig ); + TOOLS_DLLPRIVATE Config& operator = ( const Config& rConfig ); }; #endif // _SV_CONFIG_HXX diff --git a/tools/inc/tools/contnr.hxx b/tools/inc/tools/contnr.hxx index c2fdc20de0e4..5cf8e7b74569 100644 --- a/tools/inc/tools/contnr.hxx +++ b/tools/inc/tools/contnr.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/date.hxx b/tools/inc/tools/date.hxx index 43bbf9472d69..50b31edb0f83 100644 --- a/tools/inc/tools/date.hxx +++ b/tools/inc/tools/date.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ enum DayOfWeek { MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, class TOOLS_DLLPUBLIC Date { private: - sal_uInt32 nDate; + sal_uInt32 nDate; public: Date(); @@ -59,59 +59,59 @@ public: ( ( sal_uInt32( nMonth % 100 ) ) * 100 ) + ( ( sal_uInt32( nYear % 10000 ) ) * 10000); } - void SetDate( sal_uInt32 nNewDate ) { nDate = nNewDate; } - sal_uInt32 GetDate() const { return nDate; } + void SetDate( sal_uInt32 nNewDate ) { nDate = nNewDate; } + sal_uInt32 GetDate() const { return nDate; } - void SetDay( USHORT nNewDay ); - void SetMonth( USHORT nNewMonth ); - void SetYear( USHORT nNewYear ); - USHORT GetDay() const { return (USHORT)(nDate % 100); } - USHORT GetMonth() const { return (USHORT)((nDate / 100) % 100); } - USHORT GetYear() const { return (USHORT)(nDate / 10000); } + void SetDay( USHORT nNewDay ); + void SetMonth( USHORT nNewMonth ); + void SetYear( USHORT nNewYear ); + USHORT GetDay() const { return (USHORT)(nDate % 100); } + USHORT GetMonth() const { return (USHORT)((nDate / 100) % 100); } + USHORT GetYear() const { return (USHORT)(nDate / 10000); } - DayOfWeek GetDayOfWeek() const; - USHORT GetDayOfYear() const; + DayOfWeek GetDayOfWeek() const; + USHORT GetDayOfYear() const; /** nMinimumNumberOfDaysInWeek: how many days of a week must reside in the first week of a year. */ - USHORT GetWeekOfYear( DayOfWeek eStartDay = MONDAY, + USHORT GetWeekOfYear( DayOfWeek eStartDay = MONDAY, sal_Int16 nMinimumNumberOfDaysInWeek = 4 ) const; - USHORT GetDaysInMonth() const; - USHORT GetDaysInYear() const { return (IsLeapYear()) ? 366 : 365; } - BOOL IsLeapYear() const; - BOOL IsValid() const; + USHORT GetDaysInMonth() const; + USHORT GetDaysInYear() const { return (IsLeapYear()) ? 366 : 365; } + BOOL IsLeapYear() const; + BOOL IsValid() const; - BOOL IsBetween( const Date& rFrom, const Date& rTo ) const + BOOL IsBetween( const Date& rFrom, const Date& rTo ) const { return ((nDate >= rFrom.nDate) && (nDate <= rTo.nDate)); } - BOOL operator ==( const Date& rDate ) const + BOOL operator ==( const Date& rDate ) const { return (nDate == rDate.nDate); } - BOOL operator !=( const Date& rDate ) const + BOOL operator !=( const Date& rDate ) const { return (nDate != rDate.nDate); } - BOOL operator >( const Date& rDate ) const + BOOL operator >( const Date& rDate ) const { return (nDate > rDate.nDate); } - BOOL operator <( const Date& rDate ) const + BOOL operator <( const Date& rDate ) const { return (nDate < rDate.nDate); } - BOOL operator >=( const Date& rDate ) const + BOOL operator >=( const Date& rDate ) const { return (nDate >= rDate.nDate); } - BOOL operator <=( const Date& rDate ) const + BOOL operator <=( const Date& rDate ) const { return (nDate <= rDate.nDate); } - Date& operator =( const Date& rDate ) + Date& operator =( const Date& rDate ) { nDate = rDate.nDate; return *this; } - Date& operator +=( long nDays ); - Date& operator -=( long nDays ); - Date& operator ++(); - Date& operator --(); + Date& operator +=( long nDays ); + Date& operator -=( long nDays ); + Date& operator ++(); + Date& operator --(); #ifndef MPW33 - Date operator ++( int ); - Date operator --( int ); + Date operator ++( int ); + Date operator --( int ); #endif - TOOLS_DLLPUBLIC friend Date operator +( const Date& rDate, long nDays ); - TOOLS_DLLPUBLIC friend Date operator -( const Date& rDate, long nDays ); - TOOLS_DLLPUBLIC friend long operator -( const Date& rDate1, const Date& rDate2 ); + TOOLS_DLLPUBLIC friend Date operator +( const Date& rDate, long nDays ); + TOOLS_DLLPUBLIC friend Date operator -( const Date& rDate, long nDays ); + TOOLS_DLLPUBLIC friend long operator -( const Date& rDate1, const Date& rDate2 ); static long DateToDays( USHORT nDay, USHORT nMonth, USHORT nYear ); diff --git a/tools/inc/tools/datetime.hxx b/tools/inc/tools/datetime.hxx index c4cf26a4b0db..1a782486250b 100644 --- a/tools/inc/tools/datetime.hxx +++ b/tools/inc/tools/datetime.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,8 +78,8 @@ public: { Date::operator+=( nDays ); return *this; } DateTime& operator -=( long nDays ) { Date::operator-=( nDays ); return *this; } - DateTime& operator +=( double fTimeInDays ); - DateTime& operator -=( double fTimeInDays ) + DateTime& operator +=( double fTimeInDays ); + DateTime& operator -=( double fTimeInDays ) { return operator+=( -fTimeInDays ); } DateTime& operator +=( const Time& rTime ); DateTime& operator -=( const Time& rTime ); @@ -91,8 +91,8 @@ public: { return operator+( rDateTime, -fTimeInDays ); } TOOLS_DLLPUBLIC friend DateTime operator +( const DateTime& rDateTime, const Time& rTime ); TOOLS_DLLPUBLIC friend DateTime operator -( const DateTime& rDateTime, const Time& rTime ); - TOOLS_DLLPUBLIC friend double operator -( const DateTime& rDateTime1, const DateTime& rDateTime2 ); - TOOLS_DLLPUBLIC friend long operator -( const DateTime& rDateTime, const Date& rDate ) + TOOLS_DLLPUBLIC friend double operator -( const DateTime& rDateTime1, const DateTime& rDateTime2 ); + TOOLS_DLLPUBLIC friend long operator -( const DateTime& rDateTime, const Date& rDate ) { return (const Date&) rDateTime - rDate; } DateTime& operator =( const DateTime& rDateTime ); diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx index 5dff4f3c2f4b..b8aa1c8b59fe 100644 --- a/tools/inc/tools/debug.hxx +++ b/tools/inc/tools/debug.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -725,7 +725,7 @@ typedef const sal_Char* (*DbgUsr)(const void* pThis ); #define DBG_ENDAPPEXECUTE() ((void)0) #define DBG_MEMTEST() ((void)0) -#define DBG_MEMTEST_PTR( p ) ((void)0) +#define DBG_MEMTEST_PTR( p ) ((void)0) #define DBG_NAME( aName ) #define DBG_NAMEEX( aName ) diff --git a/tools/inc/tools/diagnose_ex.h b/tools/inc/tools/diagnose_ex.h index c0646a46ec21..b244d11dc305 100644 --- a/tools/inc/tools/diagnose_ex.h +++ b/tools/inc/tools/diagnose_ex.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/download.hxx b/tools/inc/tools/download.hxx index 08cc71280b59..b187433927cd 100644 --- a/tools/inc/tools/download.hxx +++ b/tools/inc/tools/download.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,13 +32,13 @@ class String; class Link; -#define DOWNLOAD_SUCCESS 0 -#define DOWNLOAD_CONNECT 1 -#define DOWNLOAD_LOCATION 2 -#define DOWNLOAD_ABORT 3 -#define DOWNLOAD_FILEACCESS 4 -#define DOWNLOAD_INSTALL 5 -#define DOWNLOAD_ERROR 6 +#define DOWNLOAD_SUCCESS 0 +#define DOWNLOAD_CONNECT 1 +#define DOWNLOAD_LOCATION 2 +#define DOWNLOAD_ABORT 3 +#define DOWNLOAD_FILEACCESS 4 +#define DOWNLOAD_INSTALL 5 +#define DOWNLOAD_ERROR 6 class Downloader /* *************************************************************************** diff --git a/tools/inc/tools/dynary.hxx b/tools/inc/tools/dynary.hxx index df3ee25f6d9c..1693be40e435 100644 --- a/tools/inc/tools/dynary.hxx +++ b/tools/inc/tools/dynary.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,9 +75,9 @@ public: class ClassName : private DynArray \ { \ public: \ - using DynArray::SetSize; \ - using DynArray::GetSize; \ - using DynArray::Clear; \ + using DynArray::SetSize; \ + using DynArray::GetSize; \ + using DynArray::Clear; \ \ ClassName( ULONG nSize = 16 ) : \ DynArray( nSize ) {} \ diff --git a/tools/inc/tools/eacopier.hxx b/tools/inc/tools/eacopier.hxx index 000df07fc6d3..c80eeb0d35cc 100644 --- a/tools/inc/tools/eacopier.hxx +++ b/tools/inc/tools/eacopier.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,14 +33,14 @@ class SvFileStream; class EA_Copier { - static EA_Copier* _pCopier; + static EA_Copier* _pCopier; public: - static void Register( EA_Copier* pCopier ); - static EA_Copier* Get(); + static void Register( EA_Copier* pCopier ); + static EA_Copier* Get(); - virtual ~EA_Copier(); - virtual BOOL Copy( const SvFileStream& rFrom, const SvFileStream& rTo ) const = 0; + virtual ~EA_Copier(); + virtual BOOL Copy( const SvFileStream& rFrom, const SvFileStream& rTo ) const = 0; }; #endif diff --git a/tools/inc/tools/errcode.hxx b/tools/inc/tools/errcode.hxx index ced3b3ac700a..cf767b842b7a 100644 --- a/tools/inc/tools/errcode.hxx +++ b/tools/inc/tools/errcode.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -120,10 +120,10 @@ inline ULONG ERRCODE_TOERROR( ULONG x ) #define ERRCODE_AREA_SVX_END (ERRCODE_AREA_SO-1) #define ERRCODE_AREA_SO (9UL << ERRCODE_AREA_SHIFT) #define ERRCODE_AREA_SO_END (ERRCODE_AREA_SBX-1) -#define ERRCODE_AREA_SBX (10UL << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_SBX_END ((11UL << ERRCODE_AREA_SHIFT) - 1) -#define ERRCODE_AREA_DB (11UL << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_DB_END ((12UL << ERRCODE_AREA_SHIFT) - 1) +#define ERRCODE_AREA_SBX (10UL << ERRCODE_AREA_SHIFT) +#define ERRCODE_AREA_SBX_END ((11UL << ERRCODE_AREA_SHIFT) - 1) +#define ERRCODE_AREA_DB (11UL << ERRCODE_AREA_SHIFT) +#define ERRCODE_AREA_DB_END ((12UL << ERRCODE_AREA_SHIFT) - 1) #define ERRCODE_AREA_JAVA (12UL << ERRCODE_AREA_SHIFT) #define ERRCODE_AREA_JAVA_END ((13UL << ERRCODE_AREA_SHIFT) - 1) #define ERRCODE_AREA_UUI (13UL << ERRCODE_AREA_SHIFT) @@ -173,9 +173,9 @@ inline ULONG ERRCODE_TOERROR( ULONG x ) #define ERRCODE_CLASS_EXPORT (18UL << ERRCODE_CLASS_SHIFT) #define ERRCODE_CLASS_FILTER (19UL << ERRCODE_CLASS_SHIFT) #define ERRCODE_CLASS_SO (20UL << ERRCODE_CLASS_SHIFT) -#define ERRCODE_CLASS_SBX (21UL << ERRCODE_CLASS_SHIFT) -#define ERRCODE_CLASS_RUNTIME (22UL << ERRCODE_CLASS_SHIFT) -#define ERRCODE_CLASS_COMPILER (23UL << ERRCODE_CLASS_SHIFT) +#define ERRCODE_CLASS_SBX (21UL << ERRCODE_CLASS_SHIFT) +#define ERRCODE_CLASS_RUNTIME (22UL << ERRCODE_CLASS_SHIFT) +#define ERRCODE_CLASS_COMPILER (23UL << ERRCODE_CLASS_SHIFT) #define ERRCODE_NONE (0UL) #define ERRCODE_ABORT ERRCODE_IO_ABORT @@ -238,23 +238,23 @@ inline ULONG ERRCODE_TOERROR( ULONG x ) ERRCODE_AREA_IO) #define ERRCODE_IO_RECURSIVE (30UL |ERRCODE_CLASS_PARAMETER|\ ERRCODE_AREA_IO) -#define ERRCODE_IO_NAMETOOLONG (31UL |ERRCODE_CLASS_PARAMETER|\ +#define ERRCODE_IO_NAMETOOLONG (31UL |ERRCODE_CLASS_PARAMETER|\ ERRCODE_AREA_IO) -#define ERRCODE_IO_INVALIDLENGTH (32UL |ERRCODE_CLASS_PARAMETER|\ +#define ERRCODE_IO_INVALIDLENGTH (32UL |ERRCODE_CLASS_PARAMETER|\ ERRCODE_AREA_IO) -#define ERRCODE_IO_CURRENTDIR (33UL |ERRCODE_CLASS_PARAMETER|\ +#define ERRCODE_IO_CURRENTDIR (33UL |ERRCODE_CLASS_PARAMETER|\ ERRCODE_AREA_IO) -#define ERRCODE_IO_NOTSAMEDEVICE (34UL |ERRCODE_CLASS_PARAMETER|\ +#define ERRCODE_IO_NOTSAMEDEVICE (34UL |ERRCODE_CLASS_PARAMETER|\ ERRCODE_AREA_IO) -#define ERRCODE_IO_DEVICENOTREADY (35UL |ERRCODE_CLASS_READ|\ +#define ERRCODE_IO_DEVICENOTREADY (35UL |ERRCODE_CLASS_READ|\ ERRCODE_AREA_IO) -#define ERRCODE_IO_BADCRC (36UL |ERRCODE_CLASS_READ|\ +#define ERRCODE_IO_BADCRC (36UL |ERRCODE_CLASS_READ|\ ERRCODE_AREA_IO) -#define ERRCODE_IO_WRITEPROTECTED (37UL |ERRCODE_CLASS_ACCESS|\ +#define ERRCODE_IO_WRITEPROTECTED (37UL |ERRCODE_CLASS_ACCESS|\ ERRCODE_AREA_IO) -#define ERRCODE_IO_BROKENPACKAGE (38UL |ERRCODE_CLASS_FORMAT|\ +#define ERRCODE_IO_BROKENPACKAGE (38UL |ERRCODE_CLASS_FORMAT|\ ERRCODE_AREA_IO) -#define ERRCODE_IO_NOTSTORABLEINBINARYFORMAT (39UL |ERRCODE_CLASS_FORMAT|\ +#define ERRCODE_IO_NOTSTORABLEINBINARYFORMAT (39UL |ERRCODE_CLASS_FORMAT|\ ERRCODE_AREA_IO) // FsysErrorCodes diff --git a/tools/inc/tools/errinf.hxx b/tools/inc/tools/errinf.hxx index 21867456fdd2..45141af278b1 100644 --- a/tools/inc/tools/errinf.hxx +++ b/tools/inc/tools/errinf.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -202,14 +202,14 @@ class TOOLS_DLLPUBLIC ErrorHandler private: ErrHdl_Impl* pImpl; - static USHORT HandleError_Impl( ULONG lId, - USHORT nFlags, - BOOL bJustCreateString, + static USHORT HandleError_Impl( ULONG lId, + USHORT nFlags, + BOOL bJustCreateString, String & rError); protected: - virtual BOOL CreateString( const ErrorInfo *, + virtual BOOL CreateString( const ErrorInfo *, String &, USHORT& nMask ) const = 0; - BOOL ForwCreateString( const ErrorInfo*, + BOOL ForwCreateString( const ErrorInfo*, String&, USHORT& nMask ) const; public: @@ -231,7 +231,7 @@ public: class TOOLS_DLLPUBLIC SimpleErrorHandler : private ErrorHandler { protected: - virtual BOOL CreateString( const ErrorInfo*, String &, + virtual BOOL CreateString( const ErrorInfo*, String &, USHORT &nMask ) const; public: diff --git a/tools/inc/tools/extendapplicationenvironment.hxx b/tools/inc/tools/extendapplicationenvironment.hxx index 6c435a0ab0bc..05eac33effba 100644 --- a/tools/inc/tools/extendapplicationenvironment.hxx +++ b/tools/inc/tools/extendapplicationenvironment.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/fldunit.hxx b/tools/inc/tools/fldunit.hxx index d3d7dcada5ca..d877776d4d86 100644 --- a/tools/inc/tools/fldunit.hxx +++ b/tools/inc/tools/fldunit.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/fontenum.hxx b/tools/inc/tools/fontenum.hxx index c9827ba17e1d..0e0f1b2f7368 100644 --- a/tools/inc/tools/fontenum.hxx +++ b/tools/inc/tools/fontenum.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -128,20 +128,20 @@ enum FontStrikeout { STRIKEOUT_NONE, STRIKEOUT_SINGLE, STRIKEOUT_DOUBLE, #define ENUM_FONTEMPHASISMARK_DECLARED typedef USHORT FontEmphasisMark; -#define EMPHASISMARK_NONE ((FontEmphasisMark)0x0000) -#define EMPHASISMARK_DOT ((FontEmphasisMark)0x0001) -#define EMPHASISMARK_CIRCLE ((FontEmphasisMark)0x0002) -#define EMPHASISMARK_DISC ((FontEmphasisMark)0x0003) -#define EMPHASISMARK_ACCENT ((FontEmphasisMark)0x0004) -#define EMPHASISMARK_STYLE ((FontEmphasisMark)0x00FF) -#define EMPHASISMARK_POS_ABOVE ((FontEmphasisMark)0x1000) -#define EMPHASISMARK_POS_BELOW ((FontEmphasisMark)0x2000) +#define EMPHASISMARK_NONE ((FontEmphasisMark)0x0000) +#define EMPHASISMARK_DOT ((FontEmphasisMark)0x0001) +#define EMPHASISMARK_CIRCLE ((FontEmphasisMark)0x0002) +#define EMPHASISMARK_DISC ((FontEmphasisMark)0x0003) +#define EMPHASISMARK_ACCENT ((FontEmphasisMark)0x0004) +#define EMPHASISMARK_STYLE ((FontEmphasisMark)0x00FF) +#define EMPHASISMARK_POS_ABOVE ((FontEmphasisMark)0x1000) +#define EMPHASISMARK_POS_BELOW ((FontEmphasisMark)0x2000) // Only for kompability -#define EMPHASISMARK_DOTS_ABOVE (EMPHASISMARK_DOT | EMPHASISMARK_POS_ABOVE) -#define EMPHASISMARK_DOTS_BELOW (EMPHASISMARK_DOT | EMPHASISMARK_POS_BELOW) -#define EMPHASISMARK_SIDE_DOTS (EMPHASISMARK_ACCENT | EMPHASISMARK_POS_ABOVE) -#define EMPHASISMARK_CIRCLE_ABOVE (EMPHASISMARK_CIRCLE | EMPHASISMARK_POS_ABOVE) +#define EMPHASISMARK_DOTS_ABOVE (EMPHASISMARK_DOT | EMPHASISMARK_POS_ABOVE) +#define EMPHASISMARK_DOTS_BELOW (EMPHASISMARK_DOT | EMPHASISMARK_POS_BELOW) +#define EMPHASISMARK_SIDE_DOTS (EMPHASISMARK_ACCENT | EMPHASISMARK_POS_ABOVE) +#define EMPHASISMARK_CIRCLE_ABOVE (EMPHASISMARK_CIRCLE | EMPHASISMARK_POS_ABOVE) #endif @@ -169,4 +169,4 @@ enum FontAntiAlias { ANTIALIAS_DONTKNOW, ANTIALIAS_FALSE, ANTIALIAS_TRUE }; #endif -#endif // _TOOLS_FONTENUM_HXX +#endif // _TOOLS_FONTENUM_HXX diff --git a/tools/inc/tools/fract.hxx b/tools/inc/tools/fract.hxx index d4138eb12f88..7769e88ab541 100644 --- a/tools/inc/tools/fract.hxx +++ b/tools/inc/tools/fract.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx index 1ff0048c143a..880768c89d8c 100644 --- a/tools/inc/tools/fsys.hxx +++ b/tools/inc/tools/fsys.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,58 +53,58 @@ struct FileCopier_Impl; class SvFileStream; class BigInt; -#define FSYS_BUFSIZE 1024 -#define FSYS_SHORTNAME_DELIMITER '@' +#define FSYS_BUFSIZE 1024 +#define FSYS_SHORTNAME_DELIMITER '@' // FSysAccess typedef int FSysAccess; -#define FSYS_ACCESS_FORCED 1 -#define FSYS_ACCESS_FLOPPY FSYS_ACCESS_FORCED -#define FSYS_ACCESS_CACHED 2 +#define FSYS_ACCESS_FORCED 1 +#define FSYS_ACCESS_FLOPPY FSYS_ACCESS_FORCED +#define FSYS_ACCESS_CACHED 2 // DirEntryKind typedef int DirEntryKind; -#define FSYS_KIND_NONE ((DirEntryKind) 0) -#define FSYS_KIND_UNKNOWN FSYS_KIND_NONE -#define FSYS_KIND_FILE ((DirEntryKind) 1) -#define FSYS_KIND_DIR ((DirEntryKind) 2) -#define FSYS_KIND_DEV ((DirEntryKind) 4) -#define FSYS_KIND_BLOCK ((DirEntryKind) 8) -#define FSYS_KIND_CHAR ((DirEntryKind) 16) -#define FSYS_KIND_WILD ((DirEntryKind) 32) -#define FSYS_KIND_BLOCK_REMOTE ((DirEntryKind) 64) //TPF: fuer RFS -#define FSYS_KIND_REMOVEABLE ((DirEntryKind) 128) -#define FSYS_KIND_FIXED ((DirEntryKind) 256) -#define FSYS_KIND_REMOTE ((DirEntryKind) 512) -#define FSYS_KIND_RAM ((DirEntryKind) 1024) -#define FSYS_KIND_CDROM ((DirEntryKind) 2048) -#define FSYS_KIND_ALL ((DirEntryKind) 4095) -#define FSYS_KIND_VISIBLE ((DirEntryKind) 4096) +#define FSYS_KIND_NONE ((DirEntryKind) 0) +#define FSYS_KIND_UNKNOWN FSYS_KIND_NONE +#define FSYS_KIND_FILE ((DirEntryKind) 1) +#define FSYS_KIND_DIR ((DirEntryKind) 2) +#define FSYS_KIND_DEV ((DirEntryKind) 4) +#define FSYS_KIND_BLOCK ((DirEntryKind) 8) +#define FSYS_KIND_CHAR ((DirEntryKind) 16) +#define FSYS_KIND_WILD ((DirEntryKind) 32) +#define FSYS_KIND_BLOCK_REMOTE ((DirEntryKind) 64) //TPF: fuer RFS +#define FSYS_KIND_REMOVEABLE ((DirEntryKind) 128) +#define FSYS_KIND_FIXED ((DirEntryKind) 256) +#define FSYS_KIND_REMOTE ((DirEntryKind) 512) +#define FSYS_KIND_RAM ((DirEntryKind) 1024) +#define FSYS_KIND_CDROM ((DirEntryKind) 2048) +#define FSYS_KIND_ALL ((DirEntryKind) 4095) +#define FSYS_KIND_VISIBLE ((DirEntryKind) 4096) // FSysSort typedef int FSysSort; -#define FSYS_SORT_NONE ((FSysSort) 0) -#define FSYS_SORT_SIZE ((FSysSort) 1) -#define FSYS_SORT_CREATED ((FSysSort) 2) -#define FSYS_SORT_MODIFYED ((FSysSort) 4) -#define FSYS_SORT_ACCESSED ((FSysSort) 8) -#define FSYS_SORT_ASCENDING ((FSysSort) 16) -#define FSYS_SORT_DESCENDING ((FSysSort) 32) -#define FSYS_SORT_EXT ((FSysSort) 64) -#define FSYS_SORT_NAME ((FSysSort) 128) -#define FSYS_SORT_KIND ((FSysSort) 256) -#define FSYS_SORT_CREATOR ((FSysSort) 512) -#define FSYS_SORT_END ((FSysSort)1024) +#define FSYS_SORT_NONE ((FSysSort) 0) +#define FSYS_SORT_SIZE ((FSysSort) 1) +#define FSYS_SORT_CREATED ((FSysSort) 2) +#define FSYS_SORT_MODIFYED ((FSysSort) 4) +#define FSYS_SORT_ACCESSED ((FSysSort) 8) +#define FSYS_SORT_ASCENDING ((FSysSort) 16) +#define FSYS_SORT_DESCENDING ((FSysSort) 32) +#define FSYS_SORT_EXT ((FSysSort) 64) +#define FSYS_SORT_NAME ((FSysSort) 128) +#define FSYS_SORT_KIND ((FSysSort) 256) +#define FSYS_SORT_CREATOR ((FSysSort) 512) +#define FSYS_SORT_END ((FSysSort)1024) // DirEntryFlag enum DirEntryFlag { FSYS_FLAG_NORMAL, - FSYS_FLAG_VOLUME, // Dir( FSYS_FLAG_VOLUME ) und GetDevice() - FSYS_FLAG_ABSROOT, // z.B. "a:\" oder "\" - FSYS_FLAG_RELROOT, // z.B. "a:", "a:." oder "." + FSYS_FLAG_VOLUME, // Dir( FSYS_FLAG_VOLUME ) und GetDevice() + FSYS_FLAG_ABSROOT, // z.B. "a:\" oder "\" + FSYS_FLAG_RELROOT, // z.B. "a:", "a:." oder "." FSYS_FLAG_CURRENT = FSYS_FLAG_RELROOT, // Synonym fuer FSYS_FLAG_RELROOT - FSYS_FLAG_PARENT, // z.B. ".." + FSYS_FLAG_PARENT, // z.B. ".." FSYS_FLAG_INVALID }; @@ -131,20 +131,20 @@ enum FSysPathStyle // FSysAction typedef int FSysAction; -#define FSYS_ACTION_COPYFILE 0x01 // not only create hardlink -#define FSYS_ACTION_RECURSIVE 0x02 // deep through dircetory structure -#define FSYS_ACTION_USERECYCLEBIN 0x04 // move to recycle bin -#define FSYS_ACTION_MOVE 0x08 // delete after copy (=> move) -#define FSYS_ACTION_CONTINUE 0x10 // continue on error -#define FSYS_ACTION_KEEP_EXISTING 0x20 // do not overwrite objects in +#define FSYS_ACTION_COPYFILE 0x01 // not only create hardlink +#define FSYS_ACTION_RECURSIVE 0x02 // deep through dircetory structure +#define FSYS_ACTION_USERECYCLEBIN 0x04 // move to recycle bin +#define FSYS_ACTION_MOVE 0x08 // delete after copy (=> move) +#define FSYS_ACTION_CONTINUE 0x10 // continue on error +#define FSYS_ACTION_KEEP_EXISTING 0x20 // do not overwrite objects in // target folder in case of name // clashes -#define FSYS_ACTION_STANDARD 0 +#define FSYS_ACTION_STANDARD 0 // Fuer RFS -#define RFS_IDENTIFIER "-rfs-" -#define RFS_LOWER "-rfs-" -#define RFS_UPPER "-RFS-" +#define RFS_IDENTIFIER "-rfs-" +#define RFS_LOWER "-rfs-" +#define RFS_UPPER "-RFS-" typedef ULONG FSysError; @@ -182,65 +182,65 @@ String FSys2Gui( const String& rStr ); struct dirent; class TOOLS_DLLPUBLIC FileStat { - friend class CORmFSys; - friend class Dir; - friend struct DirReader_Impl; - friend void ImpInitFileStat( FileStat&, dirent* ); - - ULONG nError; - DirEntryKind nKindFlags; - ULONG nSize; - String aCreator; - String aType; - Date aDateCreated; - Time aTimeCreated; - Date aDateModified; - Time aTimeModified; - Date aDateAccessed; - Time aTimeAccessed; + friend class CORmFSys; + friend class Dir; + friend struct DirReader_Impl; + friend void ImpInitFileStat( FileStat&, dirent* ); + + ULONG nError; + DirEntryKind nKindFlags; + ULONG nSize; + String aCreator; + String aType; + Date aDateCreated; + Time aTimeCreated; + Date aDateModified; + Time aTimeModified; + Date aDateAccessed; + Time aTimeAccessed; private: - TOOLS_DLLPRIVATE void ImpInit( void* ); + TOOLS_DLLPRIVATE void ImpInit( void* ); protected: // Implementation - FileStat( const void *pInfo, // CInfoPBRec + FileStat( const void *pInfo, // CInfoPBRec const void *pVolInfo ); // ParamBlockRec public: FileStat(); FileStat( const DirEntry& rDirEntry, FSysAccess nAccess = FSYS_ACCESS_FLOPPY ); - BOOL Update( const DirEntry& rDirEntry, + BOOL Update( const DirEntry& rDirEntry, BOOL bForceAccess = TRUE ); - ULONG GetError() const { return ERRCODE_TOERROR(nError); } - ULONG GetErrorCode() const { return nError; } + ULONG GetError() const { return ERRCODE_TOERROR(nError); } + ULONG GetErrorCode() const { return nError; } - ULONG GetSize() const { return nSize; } + ULONG GetSize() const { return nSize; } - DirEntryKind GetKind() const { return nKindFlags; } - BOOL IsKind( DirEntryKind nKind ) const; + DirEntryKind GetKind() const { return nKindFlags; } + BOOL IsKind( DirEntryKind nKind ) const; - String GetType() const { return aType; } - String GetCreator() const { return aCreator; } + String GetType() const { return aType; } + String GetCreator() const { return aCreator; } - Date DateCreated() const { return aDateCreated; } - Time TimeCreated() const { return aTimeCreated; } - Date DateModified() const { return aDateModified; } - Time TimeModified() const { return aTimeModified; } - Date DateAccessed() const { return aDateAccessed; } - Time TimeAccessed() const { return aTimeAccessed; } - BOOL IsYounger( const FileStat& rIsOlder ) const; + Date DateCreated() const { return aDateCreated; } + Time TimeCreated() const { return aTimeCreated; } + Date DateModified() const { return aDateModified; } + Time TimeModified() const { return aTimeModified; } + Date DateAccessed() const { return aDateAccessed; } + Time TimeAccessed() const { return aTimeAccessed; } + BOOL IsYounger( const FileStat& rIsOlder ) const; #define TF_FSYS_READONLY_FLAG - static ULONG SetReadOnlyFlag( const DirEntry &rEntry, BOOL bRO = TRUE ); - static BOOL GetReadOnlyFlag( const DirEntry &rEntry ); - static BOOL HasReadOnlyFlag(); + static ULONG SetReadOnlyFlag( const DirEntry &rEntry, BOOL bRO = TRUE ); + static BOOL GetReadOnlyFlag( const DirEntry &rEntry ); + static BOOL HasReadOnlyFlag(); - static ErrCode QueryDiskSpace( const String &rPath, + static ErrCode QueryDiskSpace( const String &rPath, BigInt &rFreeBytes, BigInt &rTotalBytes ); - static void SetDateTime( const String& rFileName, + static void SetDateTime( const String& rFileName, const DateTime& rNewDateTime ); }; @@ -258,15 +258,15 @@ friend struct DirReader_Impl; friend class FileCopier; #ifdef FEAT_FSYS_DOUBLESPEED - FileStat* pStat; // optional + FileStat* pStat; // optional #endif - ByteString aName; - DirEntry* pParent; - ULONG nError; - DirEntryFlag eFlag; + ByteString aName; + DirEntry* pParent; + ULONG nError; + DirEntryFlag eFlag; private: - TOOLS_DLLPRIVATE DirEntry( const ByteString& rInitName, + TOOLS_DLLPRIVATE DirEntry( const ByteString& rInitName, DirEntryFlag aDirFlag, FSysPathStyle eStyle ); @@ -276,34 +276,34 @@ private: friend class FileStat; friend const char* ImpCheckDirEntry( const void* p ); - TOOLS_DLLPRIVATE FSysError ImpParseName( const ByteString& rIntiName, + TOOLS_DLLPRIVATE FSysError ImpParseName( const ByteString& rIntiName, FSysPathStyle eParser ); - TOOLS_DLLPRIVATE FSysError ImpParseOs2Name( const ByteString& rPfad, + TOOLS_DLLPRIVATE FSysError ImpParseOs2Name( const ByteString& rPfad, FSysPathStyle eStyle ); - TOOLS_DLLPRIVATE FSysError ImpParseUnixName( const ByteString& rPfad, + TOOLS_DLLPRIVATE FSysError ImpParseUnixName( const ByteString& rPfad, FSysPathStyle eStyle ); - TOOLS_DLLPRIVATE USHORT ImpTryUrl( DirEntryStack& rStack, const String& rPfad, FSysPathStyle eStyle ); - TOOLS_DLLPRIVATE const DirEntry* ImpGetTopPtr() const; - TOOLS_DLLPRIVATE DirEntry* ImpGetTopPtr(); - TOOLS_DLLPRIVATE DirEntry* ImpGetPreTopPtr(); - TOOLS_DLLPRIVATE BOOL ImpToRel( String aStart ); + TOOLS_DLLPRIVATE USHORT ImpTryUrl( DirEntryStack& rStack, const String& rPfad, FSysPathStyle eStyle ); + TOOLS_DLLPRIVATE const DirEntry* ImpGetTopPtr() const; + TOOLS_DLLPRIVATE DirEntry* ImpGetTopPtr(); + TOOLS_DLLPRIVATE DirEntry* ImpGetPreTopPtr(); + TOOLS_DLLPRIVATE BOOL ImpToRel( String aStart ); protected: - void ImpTrim( FSysPathStyle eStyle ); - const ByteString& ImpTheName() const; - DirEntryFlag ImpTheFlag() const { return eFlag; }; - DirEntry* ImpChangeParent( DirEntry* pNewParent, BOOL bNormalize = TRUE ); - DirEntry* ImpGetParent() { return pParent; } + void ImpTrim( FSysPathStyle eStyle ); + const ByteString& ImpTheName() const; + DirEntryFlag ImpTheFlag() const { return eFlag; }; + DirEntry* ImpChangeParent( DirEntry* pNewParent, BOOL bNormalize = TRUE ); + DirEntry* ImpGetParent() { return pParent; } #ifdef FEAT_FSYS_DOUBLESPEED - FileStat* ImpGetStat() const { return pStat; } - void ImpSetStat( FileStat *p ) { pStat = p; } + FileStat* ImpGetStat() const { return pStat; } + void ImpSetStat( FileStat *p ) { pStat = p; } #endif //#endif protected: - void SetError( ULONG nErr ) { nError = nErr; } - DirEntry* GetParent() { return pParent; } + void SetError( ULONG nErr ) { nError = nErr; } + DirEntry* GetParent() { return pParent; } public: DirEntry( DirEntryFlag aDirFlag = FSYS_FLAG_CURRENT ); DirEntry( const DirEntry& rEntry ); @@ -313,65 +313,65 @@ public: FSysPathStyle eParser = FSYS_STYLE_HOST ); ~DirEntry(); - BOOL IsLongNameOnFAT() const; - BOOL IsCaseSensitive (FSysPathStyle eFormatter = FSYS_STYLE_HOST) const; + BOOL IsLongNameOnFAT() const; + BOOL IsCaseSensitive (FSysPathStyle eFormatter = FSYS_STYLE_HOST) const; - ULONG GetError() const { return nError; } - BOOL IsValid() const; - DirEntryFlag GetFlag() const { return eFlag; }; + ULONG GetError() const { return nError; } + BOOL IsValid() const; + DirEntryFlag GetFlag() const { return eFlag; }; - void SetExtension( const String& rExt, char cSep = '.' ); - String GetExtension( char cSep = '.' ) const; - String CutExtension( char cSep = '.' ); - void SetName( const String& rName, FSysPathStyle eFormatter = FSYS_STYLE_HOST ); + void SetExtension( const String& rExt, char cSep = '.' ); + String GetExtension( char cSep = '.' ) const; + String CutExtension( char cSep = '.' ); + void SetName( const String& rName, FSysPathStyle eFormatter = FSYS_STYLE_HOST ); inline const String GetNameDirect() const { return String(aName, osl_getThreadTextEncoding()); } - String GetName( FSysPathStyle eFormatter = FSYS_STYLE_HOST ) const; - String CutName( FSysPathStyle eFormatter = FSYS_STYLE_HOST ); - void SetBase( const String& rBase, char cSep = '.' ); - String GetBase(char cSep = '.' ) const; - DirEntry GetPath() const; - DirEntry GetDevice() const; - String GetVolume() const; - String GetFull( FSysPathStyle eFormatter = FSYS_STYLE_HOST, + String GetName( FSysPathStyle eFormatter = FSYS_STYLE_HOST ) const; + String CutName( FSysPathStyle eFormatter = FSYS_STYLE_HOST ); + void SetBase( const String& rBase, char cSep = '.' ); + String GetBase(char cSep = '.' ) const; + DirEntry GetPath() const; + DirEntry GetDevice() const; + String GetVolume() const; + String GetFull( FSysPathStyle eFormatter = FSYS_STYLE_HOST, BOOL bWithDelimiter = FALSE, USHORT nMaxChars = STRING_MAXLEN ) const; - DirEntry TempName( DirEntryKind = FSYS_KIND_NONE ) const; + DirEntry TempName( DirEntryKind = FSYS_KIND_NONE ) const; static const DirEntry& SetTempNameBase( const String &rBaseName ); - BOOL MakeShortName( const String& rLongName, + BOOL MakeShortName( const String& rLongName, DirEntryKind eCreateKind = FSYS_KIND_NONE, BOOL bUseTilde = TRUE, FSysPathStyle eStyle = FSYS_STYLE_DETECT ); - bool IsAbs() const; - BOOL ToAbs(); - BOOL Find( const String& rPfad, char cDelim = 0 ); - BOOL ToRel(); - BOOL ToRel( const DirEntry& rRefDir ); - USHORT CutRelParents(); + bool IsAbs() const; + BOOL ToAbs(); + BOOL Find( const String& rPfad, char cDelim = 0 ); + BOOL ToRel(); + BOOL ToRel( const DirEntry& rRefDir ); + USHORT CutRelParents(); - BOOL SetCWD( BOOL bSloppy = FALSE ) const; - BOOL MakeDir( BOOL bSloppy = FALSE ) const; - BOOL Exists( FSysAccess nAccess = FSYS_ACCESS_FLOPPY ) const; - BOOL First(); + BOOL SetCWD( BOOL bSloppy = FALSE ) const; + BOOL MakeDir( BOOL bSloppy = FALSE ) const; + BOOL Exists( FSysAccess nAccess = FSYS_ACCESS_FLOPPY ) const; + BOOL First(); - USHORT Level() const; - const DirEntry& operator []( USHORT nParentLevel ) const; - BOOL Contains( const DirEntry &rSubEntry ) const; + USHORT Level() const; + const DirEntry& operator []( USHORT nParentLevel ) const; + BOOL Contains( const DirEntry &rSubEntry ) const; - FSysError CopyTo( const DirEntry& rDestDir, + FSysError CopyTo( const DirEntry& rDestDir, FSysAction nActions = FSYS_ACTION_STANDARD ) const; - FSysError MoveTo( const DirEntry& rDestDir ) const; - FSysError Kill( FSysAction nActions = FSYS_ACTION_STANDARD ) const; - - DirEntry& operator =( const DirEntry& rOrigDir ); - DirEntry operator +( const DirEntry& rSubDir ) const; - DirEntry& operator +=( const DirEntry& rSubDir ); - BOOL operator ==( const DirEntry& rAnotherDir ) const; - BOOL operator !=( const DirEntry& rAnotherDir ) const + FSysError MoveTo( const DirEntry& rDestDir ) const; + FSysError Kill( FSysAction nActions = FSYS_ACTION_STANDARD ) const; + + DirEntry& operator =( const DirEntry& rOrigDir ); + DirEntry operator +( const DirEntry& rSubDir ) const; + DirEntry& operator +=( const DirEntry& rSubDir ); + BOOL operator ==( const DirEntry& rAnotherDir ) const; + BOOL operator !=( const DirEntry& rAnotherDir ) const { return !(DirEntry::operator==( rAnotherDir )); } - StringCompare NameCompare( const DirEntry &rWith ) const; + StringCompare NameCompare( const DirEntry &rWith ) const; inline StringCompare NameCompareDirect( const DirEntry &rWith ) const { #ifdef UNX @@ -381,13 +381,13 @@ public: #endif } - static String GetAccessDelimiter( FSysPathStyle eFormatter = FSYS_STYLE_HOST ); - static String GetSearchDelimiter( FSysPathStyle eFormatter = FSYS_STYLE_HOST ); - static USHORT GetMaxNameLen( FSysPathStyle eFormatter = FSYS_STYLE_HOST ); + static String GetAccessDelimiter( FSysPathStyle eFormatter = FSYS_STYLE_HOST ); + static String GetSearchDelimiter( FSysPathStyle eFormatter = FSYS_STYLE_HOST ); + static USHORT GetMaxNameLen( FSysPathStyle eFormatter = FSYS_STYLE_HOST ); static FSysPathStyle GetPathStyle( const String &rDevice ); - static String ConvertNameToSystem( const String & rName ); - static String ConvertSystemToName( const String & rName ); - static BOOL IsRFSAvailable(); + static String ConvertNameToSystem( const String & rName ); + static String ConvertSystemToName( const String & rName ); + static BOOL IsRFSAvailable(); }; // -------------- @@ -396,21 +396,21 @@ public: class TOOLS_DLLPUBLIC FileCopier { - DirEntry aSource; - DirEntry aTarget; - ULONG nBytesTotal; - ULONG nBytesCopied; - Link aProgressLink; - USHORT nBlockSize; - FileCopier_Impl* pImp; + DirEntry aSource; + DirEntry aTarget; + ULONG nBytesTotal; + ULONG nBytesCopied; + Link aProgressLink; + USHORT nBlockSize; + FileCopier_Impl* pImp; private: - TOOLS_DLLPRIVATE FSysError DoCopy_Impl( + TOOLS_DLLPRIVATE FSysError DoCopy_Impl( const DirEntry &rSource, const DirEntry &rTarget ); protected: - virtual BOOL Progress(); - virtual ErrCode Error( ErrCode eErr, + virtual BOOL Progress(); + virtual ErrCode Error( ErrCode eErr, const DirEntry *pSource, const DirEntry *pTarget ); public: @@ -420,31 +420,31 @@ public: FileCopier( const FileCopier &rCopier ); virtual ~FileCopier(); - FileCopier& operator = ( const FileCopier &rCopier ); + FileCopier& operator = ( const FileCopier &rCopier ); - void SetBlockSize( USHORT nBytes ) { nBlockSize = nBytes; } - USHORT GetBlockSize() const { return nBlockSize; } + void SetBlockSize( USHORT nBytes ) { nBlockSize = nBytes; } + USHORT GetBlockSize() const { return nBlockSize; } - ULONG GetBytesTotal() const { return nBytesTotal; } - ULONG GetBytesCopied() const { return nBytesCopied; } + ULONG GetBytesTotal() const { return nBytesTotal; } + ULONG GetBytesCopied() const { return nBytesCopied; } - void SetSource( const DirEntry &rSource ) { aSource = rSource; } - void SetTarget( const DirEntry &rTarget ) { aTarget = rTarget; } - const DirEntry& GetSource() const { return aSource; } - const DirEntry& GetTarget() const { return aTarget; } + void SetSource( const DirEntry &rSource ) { aSource = rSource; } + void SetTarget( const DirEntry &rTarget ) { aTarget = rTarget; } + const DirEntry& GetSource() const { return aSource; } + const DirEntry& GetTarget() const { return aTarget; } - FSysError Execute( FSysAction nActions = FSYS_ACTION_STANDARD ); - FSysError ExecuteExact( FSysAction nActions = FSYS_ACTION_STANDARD, - FSysExact eExact = FSYS_NOTEXACT); + FSysError Execute( FSysAction nActions = FSYS_ACTION_STANDARD ); + FSysError ExecuteExact( FSysAction nActions = FSYS_ACTION_STANDARD, + FSysExact eExact = FSYS_NOTEXACT); - const DirEntry* GetErrorSource() const; - const DirEntry* GetErrorTarget() const; - ErrCode GetError() const; + const DirEntry* GetErrorSource() const; + const DirEntry* GetErrorTarget() const; + ErrCode GetError() const; - void SetProgressHdl( const Link& rLink ) { aProgressLink = rLink; } - const Link& GetProgressHdl() const { return aProgressLink; } - void SetErrorHdl( const Link& rLink ); - const Link& GetErrorHdl() const; + void SetProgressHdl( const Link& rLink ) { aProgressLink = rLink; } + const Link& GetProgressHdl() const { return aProgressLink; } + void SetErrorHdl( const Link& rLink ); + const Link& GetErrorHdl() const; }; // ------- @@ -457,29 +457,29 @@ class TOOLS_DLLPUBLIC Dir : public DirEntry friend struct DirReader_Impl; friend class CORmFSys; - DirReader_Impl* pReader; // systemabhaengig - DirEntryList* pLst; - FSysSortList* pSortLst; // NULL, wenn kein Sort gefordert - FileStatList* pStatLst; // NULL, wenn keine Stat's benoetigt - WildCard aNameMask; + DirReader_Impl* pReader; // systemabhaengig + DirEntryList* pLst; + FSysSortList* pSortLst; // NULL, wenn kein Sort gefordert + FileStatList* pStatLst; // NULL, wenn keine Stat's benoetigt + WildCard aNameMask; DirEntryKind eAttrMask; private: - TOOLS_DLLPRIVATE Dir( const Dir& ); // not allowed - TOOLS_DLLPRIVATE Dir& operator=( const Dir& ); // not allowed + TOOLS_DLLPRIVATE Dir( const Dir& ); // not allowed + TOOLS_DLLPRIVATE Dir& operator=( const Dir& ); // not allowed #ifdef _DIR_CXX - TOOLS_DLLPRIVATE FSysError ImpSetSort( std::va_list pArgs, FSysSort nSort ); - TOOLS_DLLPRIVATE void Construct( DirEntryKind nKind = FSYS_KIND_DIR|FSYS_KIND_FILE ); + TOOLS_DLLPRIVATE FSysError ImpSetSort( std::va_list pArgs, FSysSort nSort ); + TOOLS_DLLPRIVATE void Construct( DirEntryKind nKind = FSYS_KIND_DIR|FSYS_KIND_FILE ); #endif #ifndef _TOOLS_HXX protected: - BOOL ImpInsertPointReached( const DirEntry& rIsSmaller, + BOOL ImpInsertPointReached( const DirEntry& rIsSmaller, const FileStat& rNewStat, ULONG nCurPos, ULONG nSortIndex ) const; - void ImpSortedInsert( const DirEntry *pNewEntry, + void ImpSortedInsert( const DirEntry *pNewEntry, const FileStat *pNewStat ); #endif @@ -494,15 +494,15 @@ public: const WildCard& GetNameMask() const { return aNameMask; } - FSysError SetSort( FSysSort nSort, ... ); + FSysError SetSort( FSysSort nSort, ... ); - void Reset(); - USHORT Scan( USHORT nCount = 5 ); - USHORT Count( BOOL bUpdated = TRUE ) const; - BOOL Update(); + void Reset(); + USHORT Scan( USHORT nCount = 5 ); + USHORT Count( BOOL bUpdated = TRUE ) const; + BOOL Update(); - Dir& operator +=( const Dir& rDir ); - DirEntry& operator []( USHORT nIndex ) const; + Dir& operator +=( const Dir& rDir ); + DirEntry& operator []( USHORT nIndex ) const; }; // we don't need this stuff for bootstraping @@ -519,8 +519,8 @@ public: class FSysRedirector { - static FSysRedirector* _pRedirector; - static BOOL _bEnabled; + static FSysRedirector* _pRedirector; + static BOOL _bEnabled; public: /** This method must called with the one and only instance of the @@ -528,7 +528,7 @@ public: <P>It must be called with 0 when the instance is destroyed. */ - static void Register( FSysRedirector *pRedirector ); + static void Register( FSysRedirector *pRedirector ); //----------------------------------------------------------------------- /** This method returns the currently registererd instance of @@ -536,7 +536,7 @@ public: <P>If no redirector is registered, it returns 0. */ - static FSysRedirector* Redirector(); + static FSysRedirector* Redirector(); //----------------------------------------------------------------------- /** This method is to be used to redirect a file system path. @@ -556,7 +556,7 @@ public: TRUE, if the path is redirected FALSE, if the path is not redirected (unchanged) */ - static void DoRedirect( String &rPath ); + static void DoRedirect( String &rPath ); }; #endif // BOOTSTRP diff --git a/tools/inc/tools/gen.hxx b/tools/inc/tools/gen.hxx index 315e829e688b..308cc02165ce 100644 --- a/tools/inc/tools/gen.hxx +++ b/tools/inc/tools/gen.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,23 +72,23 @@ inline long FRound( double fVal ) class Pair { public: - long nA; - long nB; + long nA; + long nB; Pair(); Pair( long nA, long nB ); - long A() const { return nA; } - long B() const { return nB; } + long A() const { return nA; } + long B() const { return nB; } - long& A() { return nA; } - long& B() { return nB; } + long& A() { return nA; } + long& B() { return nB; } - BOOL operator == ( const Pair& rPair ) const; - BOOL operator != ( const Pair& rPair ) const; + BOOL operator == ( const Pair& rPair ) const; + BOOL operator != ( const Pair& rPair ) const; - TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Pair& rPair ); - TOOLS_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStream, const Pair& rPair ); + TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Pair& rPair ); + TOOLS_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStream, const Pair& rPair ); }; inline Pair::Pair() @@ -122,28 +122,28 @@ public: Point(); Point( long nX, long nY ); - long X() const { return nA; } - long Y() const { return nB; } + long X() const { return nA; } + long Y() const { return nB; } - long& X() { return nA; } - long& Y() { return nB; } + long& X() { return nA; } + long& Y() { return nB; } - void Move( long nHorzMove, long nVertMove ); - BOOL IsAbove( const Point& rPoint ) const; - BOOL IsBelow( const Point& rPoint ) const; - BOOL IsLeft( const Point& rPoint ) const; - BOOL IsRight( const Point& rPoint ) const; + void Move( long nHorzMove, long nVertMove ); + BOOL IsAbove( const Point& rPoint ) const; + BOOL IsBelow( const Point& rPoint ) const; + BOOL IsLeft( const Point& rPoint ) const; + BOOL IsRight( const Point& rPoint ) const; - Point& operator += ( const Point& rPoint ); - Point& operator -= ( const Point& rPoint ); - Point& operator *= ( const long nVal ); - Point& operator /= ( const long nVal ); + Point& operator += ( const Point& rPoint ); + Point& operator -= ( const Point& rPoint ); + Point& operator *= ( const long nVal ); + Point& operator /= ( const long nVal ); #ifdef __BORLANDC__ - friend Point operator+( const Point &rVal1, const Point &rVal2 ); - friend Point operator-( const Point &rVal1, const Point &rVal2 ); - friend Point operator*( const Point &rVal1, const long nVal2 ); - friend Point operator/( const Point &rVal1, const long nVal2 ); + friend Point operator+( const Point &rVal1, const Point &rVal2 ); + friend Point operator-( const Point &rVal1, const Point &rVal2 ); + friend Point operator*( const Point &rVal1, const long nVal2 ); + friend Point operator/( const Point &rVal1, const long nVal2 ); #else friend inline Point operator+( const Point &rVal1, const Point &rVal2 ); friend inline Point operator-( const Point &rVal1, const Point &rVal2 ); @@ -151,10 +151,10 @@ public: friend inline Point operator/( const Point &rVal1, const long nVal2 ); #endif - long getX() const { return X(); } - long getY() const { return Y(); } - void setX(long nX) { X() = nX; } - void setY(long nY) { Y() = nY; } + long getX() const { return X(); } + long getY() const { return Y(); } + void setX(long nX) { X() = nX; } + void setY(long nY) { Y() = nY; } }; inline Point::Point() @@ -249,16 +249,16 @@ public: Size(); Size( long nWidth, long nHeight ); - long Width() const { return nA; } - long Height() const { return nB; } + long Width() const { return nA; } + long Height() const { return nB; } - long& Width() { return nA; } - long& Height() { return nB; } + long& Width() { return nA; } + long& Height() { return nB; } - long getWidth() const { return Width(); } - long getHeight() const { return Height(); } - void setWidth(long nWidth) { Width() = nWidth; } - void setHeight(long nHeight) { Height() = nHeight; } + long getWidth() const { return Width(); } + long getHeight() const { return Height(); } + void setWidth(long nWidth) { Width() = nWidth; } + void setHeight(long nHeight) { Height() = nHeight; } }; inline Size::Size() @@ -274,8 +274,8 @@ inline Size::Size( long nWidth, long nHeight ) : // - Range - // --------- -#define RANGE_MIN LONG_MIN -#define RANGE_MAX LONG_MAX +#define RANGE_MIN LONG_MIN +#define RANGE_MAX LONG_MAX class Range : public Pair { @@ -283,16 +283,16 @@ public: Range(); Range( long nMin, long nMax ); - long Min() const { return nA; } - long Max() const { return nB; } - long Len() const { return nB - nA + 1; } + long Min() const { return nA; } + long Max() const { return nB; } + long Len() const { return nB - nA + 1; } - long& Min() { return nA; } - long& Max() { return nB; } + long& Min() { return nA; } + long& Max() { return nB; } - BOOL IsInside( long nIs ) const; + BOOL IsInside( long nIs ) const; - void Justify(); + void Justify(); }; inline Range::Range() @@ -322,8 +322,8 @@ inline void Range::Justify() // - Selection - // ------------- -#define SELECTION_MIN LONG_MIN -#define SELECTION_MAX LONG_MAX +#define SELECTION_MIN LONG_MIN +#define SELECTION_MAX LONG_MAX class Selection : public Pair { @@ -332,23 +332,23 @@ public: Selection( long nPos ); Selection( long nMin, long nMax ); - long Min() const { return nA; } - long Max() const { return nB; } - long Len() const { return nB - nA; } + long Min() const { return nA; } + long Max() const { return nB; } + long Len() const { return nB - nA; } - long& Min() { return nA; } - long& Max() { return nB; } + long& Min() { return nA; } + long& Max() { return nB; } - BOOL IsInside( long nIs ) const; + BOOL IsInside( long nIs ) const; - void Justify(); + void Justify(); - BOOL operator !() const { return !Len(); } + BOOL operator !() const { return !Len(); } - long getMin() const { return Min(); } - long getMax() const { return Max(); } - void setMin(long nMin) { Min() = nMin; } - void setMax(long nMax) { Max() = nMax; } + long getMin() const { return Min(); } + long getMax() const { return Max(); } + void setMin(long nMin) { Min() = nMin; } + void setMax(long nMax) { Max() = nMax; } }; inline Selection::Selection() @@ -383,15 +383,15 @@ inline void Selection::Justify() // - Rectangle - // ------------- -#define RECT_EMPTY ((short)-32767) +#define RECT_EMPTY ((short)-32767) class TOOLS_DLLPUBLIC Rectangle { public: - long nLeft; - long nTop; - long nRight; - long nBottom; + long nLeft; + long nTop; + long nRight; + long nBottom; Rectangle(); Rectangle( const Point& rLT, const Point& rRB ); @@ -399,75 +399,75 @@ public: long nRight, long nBottom ); Rectangle( const Point& rLT, const Size& rSize ); - long Left() const { return nLeft; } - long Right() const { return nRight; } - long Top() const { return nTop; } - long Bottom() const { return nBottom; } - - long& Left() { return nLeft; } - long& Right() { return nRight; } - long& Top() { return nTop; } - long& Bottom() { return nBottom; } - - inline Point TopLeft() const; - Point TopRight() const; - Point TopCenter() const; - Point BottomLeft() const; - Point BottomRight() const; - Point BottomCenter() const; - Point LeftCenter() const; - Point RightCenter() const; - Point Center() const; - - void Move( long nHorzMove, long nVertMove ); + long Left() const { return nLeft; } + long Right() const { return nRight; } + long Top() const { return nTop; } + long Bottom() const { return nBottom; } + + long& Left() { return nLeft; } + long& Right() { return nRight; } + long& Top() { return nTop; } + long& Bottom() { return nBottom; } + + inline Point TopLeft() const; + Point TopRight() const; + Point TopCenter() const; + Point BottomLeft() const; + Point BottomRight() const; + Point BottomCenter() const; + Point LeftCenter() const; + Point RightCenter() const; + Point Center() const; + + void Move( long nHorzMove, long nVertMove ); inline void Transpose(); - inline void SetPos( const Point& rPoint ); - void SetSize( const Size& rSize ); - inline Size GetSize() const; + inline void SetPos( const Point& rPoint ); + void SetSize( const Size& rSize ); + inline Size GetSize() const; - long GetWidth() const; - long GetHeight() const; + long GetWidth() const; + long GetHeight() const; - Rectangle& Union( const Rectangle& rRect ); - Rectangle& Intersection( const Rectangle& rRect ); - Rectangle GetUnion( const Rectangle& rRect ) const; - Rectangle GetIntersection( const Rectangle& rRect ) const; + Rectangle& Union( const Rectangle& rRect ); + Rectangle& Intersection( const Rectangle& rRect ); + Rectangle GetUnion( const Rectangle& rRect ) const; + Rectangle GetIntersection( const Rectangle& rRect ) const; - void Justify(); + void Justify(); - BOOL IsInside( const Point& rPOINT ) const; - BOOL IsInside( const Rectangle& rRect ) const; - BOOL IsOver( const Rectangle& rRect ) const; + BOOL IsInside( const Point& rPOINT ) const; + BOOL IsInside( const Rectangle& rRect ) const; + BOOL IsOver( const Rectangle& rRect ) const; - void SetEmpty() { nRight = nBottom = RECT_EMPTY; } - BOOL IsEmpty() const; + void SetEmpty() { nRight = nBottom = RECT_EMPTY; } + BOOL IsEmpty() const; - BOOL operator == ( const Rectangle& rRect ) const; - BOOL operator != ( const Rectangle& rRect ) const; + BOOL operator == ( const Rectangle& rRect ) const; + BOOL operator != ( const Rectangle& rRect ) const; - Rectangle& operator += ( const Point& rPt ); - Rectangle& operator -= ( const Point& rPt ); + Rectangle& operator += ( const Point& rPt ); + Rectangle& operator -= ( const Point& rPt ); #ifdef __BORLANDC__ - friend Rectangle operator + ( const Rectangle& rRect, const Point& rPt ); - friend Rectangle operator - ( const Rectangle& rRect, const Point& rPt ); + friend Rectangle operator + ( const Rectangle& rRect, const Point& rPt ); + friend Rectangle operator - ( const Rectangle& rRect, const Point& rPt ); #else friend inline Rectangle operator + ( const Rectangle& rRect, const Point& rPt ); friend inline Rectangle operator - ( const Rectangle& rRect, const Point& rPt ); #endif - TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Rectangle& rRect ); - TOOLS_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStream, const Rectangle& rRect ); + TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Rectangle& rRect ); + TOOLS_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStream, const Rectangle& rRect ); // ONE - long getX() const { return nLeft; } - long getY() const { return nTop; } - long getWidth() const { return nRight - nLeft; } - long getHeight() const { return nBottom - nTop; } - void setX( long n ) { nRight += n-nLeft; nLeft = n; } - void setY( long n ) { nBottom += n-nTop; nTop = n; } - void setWidth( long n ) { nRight = nLeft + n; } - void setHeight( long n ) { nBottom = nTop + n; } + long getX() const { return nLeft; } + long getY() const { return nTop; } + long getWidth() const { return nRight - nLeft; } + long getHeight() const { return nBottom - nTop; } + void setX( long n ) { nRight += n-nLeft; nLeft = n; } + void setY( long n ) { nBottom += n-nTop; nTop = n; } + void setWidth( long n ) { nRight = nLeft + n; } + void setHeight( long n ) { nBottom = nTop + n; } }; inline Rectangle::Rectangle() @@ -478,26 +478,26 @@ inline Rectangle::Rectangle() inline Rectangle::Rectangle( const Point& rLT, const Point& rRB ) { - nLeft = rLT.X(); - nTop = rLT.Y(); - nRight = rRB.X(); + nLeft = rLT.X(); + nTop = rLT.Y(); + nRight = rRB.X(); nBottom = rRB.Y(); } inline Rectangle::Rectangle( long _nLeft, long _nTop, long _nRight, long _nBottom ) { - nLeft = _nLeft; - nTop = _nTop; - nRight = _nRight; + nLeft = _nLeft; + nTop = _nTop; + nRight = _nRight; nBottom = _nBottom; } inline Rectangle::Rectangle( const Point& rLT, const Size& rSize ) { - nLeft = rLT.X(); - nTop = rLT.Y(); - nRight = rSize.Width() ? nLeft+rSize.Width()-1 : RECT_EMPTY; + nLeft = rLT.X(); + nTop = rLT.Y(); + nRight = rSize.Width() ? nLeft+rSize.Width()-1 : RECT_EMPTY; nBottom = rSize.Height() ? nTop+rSize.Height()-1 : RECT_EMPTY; } @@ -656,16 +656,16 @@ inline Rectangle Rectangle::GetIntersection( const Rectangle& rRect ) const inline BOOL Rectangle::operator == ( const Rectangle& rRect ) const { - return ((nLeft == rRect.nLeft ) && - (nTop == rRect.nTop ) && + return ((nLeft == rRect.nLeft ) && + (nTop == rRect.nTop ) && (nRight == rRect.nRight ) && (nBottom == rRect.nBottom )); } inline BOOL Rectangle::operator != ( const Rectangle& rRect ) const { - return ((nLeft != rRect.nLeft ) || - (nTop != rRect.nTop ) || + return ((nLeft != rRect.nLeft ) || + (nTop != rRect.nTop ) || (nRight != rRect.nRight ) || (nBottom != rRect.nBottom )); } @@ -695,7 +695,7 @@ inline Rectangle& Rectangle::operator -= ( const Point& rPt ) inline Rectangle operator + ( const Rectangle& rRect, const Point& rPt ) { Rectangle aRect( rRect.nLeft + rPt.X(), rRect.nTop + rPt.Y(), - (rRect.nRight == RECT_EMPTY) ? RECT_EMPTY : rRect.nRight + rPt.X(), + (rRect.nRight == RECT_EMPTY) ? RECT_EMPTY : rRect.nRight + rPt.X(), (rRect.nBottom == RECT_EMPTY) ? RECT_EMPTY : rRect.nBottom + rPt.Y() ); return aRect; } @@ -704,7 +704,7 @@ inline Rectangle operator - ( const Rectangle& rRect, const Point& rPt ) { Rectangle aRect( rRect.nLeft - rPt.X(), rRect.nTop - rPt.Y(), - (rRect.nRight == RECT_EMPTY) ? RECT_EMPTY : rRect.nRight - rPt.X(), + (rRect.nRight == RECT_EMPTY) ? RECT_EMPTY : rRect.nRight - rPt.X(), (rRect.nBottom == RECT_EMPTY) ? RECT_EMPTY : rRect.nBottom - rPt.Y() ); return aRect; } diff --git a/tools/inc/tools/geninfo.hxx b/tools/inc/tools/geninfo.hxx index 1867c0278ffb..720ccb9cd788 100644 --- a/tools/inc/tools/geninfo.hxx +++ b/tools/inc/tools/geninfo.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,18 +43,18 @@ class GenericInformationList; Purpose: holds generic informations and subinformations in a simple format ******************************************************************************/ -class TOOLS_DLLPUBLIC GenericInformation : public ByteString // the key is stored in base class +class TOOLS_DLLPUBLIC GenericInformation : public ByteString // the key is stored in base class { -friend class GenericInformationList; // can be child or/and parent +friend class GenericInformationList; // can be child or/and parent private: - ByteString sValue; // holds value of data + ByteString sValue; // holds value of data ByteString sComment; - GenericInformationList *pInfoList; // holds subinformations - GenericInformationList *pParent; // holds a pointer to parent list + GenericInformationList *pInfoList; // holds subinformations + GenericInformationList *pParent; // holds a pointer to parent list // methods - void ListDeleted() { pParent = NULL; } // allowed to be accessed + void ListDeleted() { pParent = NULL; } // allowed to be accessed // from friend class // GenericInformationList @@ -193,7 +193,7 @@ DECLARE_LIST( GenericInformationList_Impl, GenericInformation * ) class TOOLS_DLLPUBLIC GenericInformationList : public GenericInformationList_Impl { private: - GenericInformation *pOwner; // holds parent of this list + GenericInformation *pOwner; // holds parent of this list protected: // methods diff --git a/tools/inc/tools/getprocessworkingdir.hxx b/tools/inc/tools/getprocessworkingdir.hxx index 9a780b7cc58f..1b0688379590 100644 --- a/tools/inc/tools/getprocessworkingdir.hxx +++ b/tools/inc/tools/getprocessworkingdir.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/globname.hxx b/tools/inc/tools/globname.hxx index e12cbc41956c..7fac64e2f74b 100644 --- a/tools/inc/tools/globname.hxx +++ b/tools/inc/tools/globname.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/inetdef.hxx b/tools/inc/tools/inetdef.hxx index 80f57dc1cbab..7341225912ab 100644 --- a/tools/inc/tools/inetdef.hxx +++ b/tools/inc/tools/inetdef.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,14 +69,14 @@ #define TOOLS_INETDEF_MOZILLA "Mozilla/3.0" #define INET_PRODUCTNAME TOOLS_INETDEF_PRODUCT " (" TOOLS_INETDEF_OS ")" -#define INET_DEF_CALLERNAME TOOLS_INETDEF_MOZILLA " (compatible; " \ +#define INET_DEF_CALLERNAME TOOLS_INETDEF_MOZILLA " (compatible; " \ TOOLS_INETDEF_PRODUCT "; " TOOLS_INETDEF_OS ")" //============================================================================ // The following definitions seem obsolete and might get removed in future. #define INET_PERS_CERT_HOMEPAGE "http://www.stardivision.de/certs.html" -#define INET_PERS_CERT_HOMEPAGE_INT \ +#define INET_PERS_CERT_HOMEPAGE_INT \ "http://www.stardivision.de/certs/certs##.html" // the above definitions are only used in svx/source/options/optinet2.cxx diff --git a/tools/inc/tools/inetmime.hxx b/tools/inc/tools/inetmime.hxx index dc662138dd50..4e8065f6264c 100644 --- a/tools/inc/tools/inetmime.hxx +++ b/tools/inc/tools/inetmime.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx index be58350d7005..d7619fc34a4d 100644 --- a/tools/inc/tools/inetmsg.hxx +++ b/tools/inc/tools/inetmsg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/inetstrm.hxx b/tools/inc/tools/inetstrm.hxx index bcf54d4323c3..1fd9a913b382 100644 --- a/tools/inc/tools/inetstrm.hxx +++ b/tools/inc/tools/inetstrm.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/iparser.hxx b/tools/inc/tools/iparser.hxx index 62c2306f9d51..78eed43e8391 100644 --- a/tools/inc/tools/iparser.hxx +++ b/tools/inc/tools/iparser.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,10 +69,10 @@ key [value] // error codes: -#define IP_NO_ERROR 0x0000 -#define IP_UNEXPECTED_EOF 0x0001 +#define IP_NO_ERROR 0x0000 +#define IP_UNEXPECTED_EOF 0x0001 -#define REPLACE_VARIABLES TRUE +#define REPLACE_VARIABLES TRUE class TOOLS_DLLPUBLIC InformationParser { diff --git a/tools/inc/tools/isofallback.hxx b/tools/inc/tools/isofallback.hxx index 3fe04c808d82..dcf4bd938376 100644 --- a/tools/inc/tools/isofallback.hxx +++ b/tools/inc/tools/isofallback.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/line.hxx b/tools/inc/tools/line.hxx index ff501ecfb2fa..c6c70df842ca 100644 --- a/tools/inc/tools/line.hxx +++ b/tools/inc/tools/line.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,10 +53,10 @@ public: void SetEnd( const Point& rEndPt ) { maEnd = rEndPt; } const Point& GetEnd() const { return maEnd; } - long Left() const { return ( maStart.X() < maEnd.X() ) ? maStart.X() : maEnd.X(); } - long Top() const { return ( maStart.Y() < maEnd.Y() ) ? maStart.Y() : maEnd.Y(); } - long Right() const { return ( maStart.X() > maEnd.X() ) ? maStart.X() : maEnd.X(); } - long Bottom() const { return ( maStart.Y() > maEnd.Y() ) ? maStart.Y() : maEnd.Y(); } + long Left() const { return ( maStart.X() < maEnd.X() ) ? maStart.X() : maEnd.X(); } + long Top() const { return ( maStart.Y() < maEnd.Y() ) ? maStart.Y() : maEnd.Y(); } + long Right() const { return ( maStart.X() > maEnd.X() ) ? maStart.X() : maEnd.X(); } + long Bottom() const { return ( maStart.Y() > maEnd.Y() ) ? maStart.Y() : maEnd.Y(); } double GetLength() const; @@ -64,8 +64,8 @@ public: BOOL Intersection( const Line& rLine, Point& rIntersection ) const; BOOL Intersection( const Rectangle& rRect, Line& rIntersection ) const; - double GetDistance( const double& rPtX, const double& rPtY ) const; - double GetDistance( const Point& rPoint ) const { return( GetDistance( rPoint.X(), rPoint.Y() ) ); } + double GetDistance( const double& rPtX, const double& rPtY ) const; + double GetDistance( const Point& rPoint ) const { return( GetDistance( rPoint.X(), rPoint.Y() ) ); } Point NearestPoint( const Point& rPoint ) const; diff --git a/tools/inc/tools/link.hxx b/tools/inc/tools/link.hxx index 412ca5f98b68..1742759055d6 100644 --- a/tools/inc/tools/link.hxx +++ b/tools/inc/tools/link.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/list.hxx b/tools/inc/tools/list.hxx index 6f6ff673b0ea..dd8fbf454f80 100644 --- a/tools/inc/tools/list.hxx +++ b/tools/inc/tools/list.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/mapunit.hxx b/tools/inc/tools/mapunit.hxx index 256e4037ecb6..0b5f5d044d19 100644 --- a/tools/inc/tools/mapunit.hxx +++ b/tools/inc/tools/mapunit.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,4 +38,4 @@ enum MapUnit { MAP_100TH_MM, MAP_10TH_MM, MAP_MM, MAP_CM, MAP_POINT, MAP_TWIP, MAP_PIXEL, MAP_SYSFONT, MAP_APPFONT, MAP_RELATIVE, MAP_REALAPPFONT, MAP_LASTENUMDUMMY }; -#endif // _TOOLS_MAPUNIT_HXX +#endif // _TOOLS_MAPUNIT_HXX diff --git a/tools/inc/tools/mempool.hxx b/tools/inc/tools/mempool.hxx index af3724816724..a96a024d4b27 100644 --- a/tools/inc/tools/mempool.hxx +++ b/tools/inc/tools/mempool.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/multisel.hxx b/tools/inc/tools/multisel.hxx index 17a5b5d36dd9..f75f4c5f03af 100644 --- a/tools/inc/tools/multisel.hxx +++ b/tools/inc/tools/multisel.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ DECLARE_LIST( ImpSelList, Range* ) #define ImpSelList List #endif -#define SFX_ENDOFSELECTION CONTAINER_ENTRY_NOTFOUND +#define SFX_ENDOFSELECTION CONTAINER_ENTRY_NOTFOUND //------------------------------------------------------------------ @@ -54,21 +54,21 @@ DECLARE_LIST( ImpSelList, Range* ) class TOOLS_DLLPUBLIC MultiSelection { private: - ImpSelList aSels; // array of SV-selections - Range aTotRange; // total range of indexes - ULONG nCurSubSel; // index in aSels of current selected index - long nCurIndex; // current selected entry - ULONG nSelCount; // number of selected indexes - BOOL bInverseCur;// inverse cursor - BOOL bCurValid; // are nCurIndex and nCurSubSel valid - BOOL bSelectNew; // auto-select newly inserted indexes + ImpSelList aSels; // array of SV-selections + Range aTotRange; // total range of indexes + ULONG nCurSubSel; // index in aSels of current selected index + long nCurIndex; // current selected entry + ULONG nSelCount; // number of selected indexes + BOOL bInverseCur;// inverse cursor + BOOL bCurValid; // are nCurIndex and nCurSubSel valid + BOOL bSelectNew; // auto-select newly inserted indexes #ifdef _SV_MULTISEL_CXX - TOOLS_DLLPRIVATE void ImplClear(); - TOOLS_DLLPRIVATE ULONG ImplFindSubSelection( long nIndex ) const; - TOOLS_DLLPRIVATE BOOL ImplMergeSubSelections( ULONG nPos1, ULONG nPos2 ); - TOOLS_DLLPRIVATE long ImplFwdUnselected(); - TOOLS_DLLPRIVATE long ImplBwdUnselected(); + TOOLS_DLLPRIVATE void ImplClear(); + TOOLS_DLLPRIVATE ULONG ImplFindSubSelection( long nIndex ) const; + TOOLS_DLLPRIVATE BOOL ImplMergeSubSelections( ULONG nPos1, ULONG nPos2 ); + TOOLS_DLLPRIVATE long ImplFwdUnselected(); + TOOLS_DLLPRIVATE long ImplBwdUnselected(); #endif public: @@ -81,35 +81,35 @@ public: ~MultiSelection(); MultiSelection& operator= ( const MultiSelection& rOrig ); - BOOL operator== ( MultiSelection& rOrig ); - BOOL operator!= ( MultiSelection& rOrig ) + BOOL operator== ( MultiSelection& rOrig ); + BOOL operator!= ( MultiSelection& rOrig ) { return !operator==( rOrig ); } - BOOL operator !() const + BOOL operator !() const { return nSelCount == 0; } - void SelectAll( BOOL bSelect = TRUE ); - BOOL Select( long nIndex, BOOL bSelect = TRUE ); - void Select( const Range& rIndexRange, BOOL bSelect = TRUE ); - BOOL IsSelected( long nIndex ) const; - BOOL IsAllSelected() const + void SelectAll( BOOL bSelect = TRUE ); + BOOL Select( long nIndex, BOOL bSelect = TRUE ); + void Select( const Range& rIndexRange, BOOL bSelect = TRUE ); + BOOL IsSelected( long nIndex ) const; + BOOL IsAllSelected() const { return nSelCount == ULONG(aTotRange.Len()); } - long GetSelectCount() const { return nSelCount; } - - void SetTotalRange( const Range& rTotRange ); - void Insert( long nIndex, long nCount = 1 ); - void Remove( long nIndex ); - void Append( long nCount = 1 ); - - const Range& GetTotalRange() const { return aTotRange; } - BOOL IsCurValid() const { return bCurValid; } - long GetCurSelected() const { return nCurIndex; } - long FirstSelected( BOOL bInverse = FALSE ); - long LastSelected(); - long NextSelected(); - long PrevSelected(); - - ULONG GetRangeCount() const { return aSels.Count(); } - const Range& GetRange( ULONG nRange ) const { return *(const Range*)aSels.GetObject(nRange); } + long GetSelectCount() const { return nSelCount; } + + void SetTotalRange( const Range& rTotRange ); + void Insert( long nIndex, long nCount = 1 ); + void Remove( long nIndex ); + void Append( long nCount = 1 ); + + const Range& GetTotalRange() const { return aTotRange; } + BOOL IsCurValid() const { return bCurValid; } + long GetCurSelected() const { return nCurIndex; } + long FirstSelected( BOOL bInverse = FALSE ); + long LastSelected(); + long NextSelected(); + long PrevSelected(); + + ULONG GetRangeCount() const { return aSels.Count(); } + const Range& GetRange( ULONG nRange ) const { return *(const Range*)aSels.GetObject(nRange); } }; class TOOLS_DLLPUBLIC StringRangeEnumerator @@ -118,7 +118,7 @@ class TOOLS_DLLPUBLIC StringRangeEnumerator { sal_Int32 nFirst; sal_Int32 nLast; - + Range() : nFirst( -1 ), nLast( -1 ) {} Range( sal_Int32 i_nFirst, sal_Int32 i_nLast ) : nFirst( i_nFirst ), nLast( i_nLast ) {} }; @@ -127,7 +127,7 @@ class TOOLS_DLLPUBLIC StringRangeEnumerator sal_Int32 mnMin; sal_Int32 mnMax; sal_Int32 mnOffset; - + bool insertRange( sal_Int32 nFirst, sal_Int32 nLast, bool bSequence, bool bMayAdjust ); bool checkValue( sal_Int32, const std::set< sal_Int32 >* i_pPossibleValues = NULL ) const; public: @@ -137,7 +137,7 @@ public: const std::set< sal_Int32 >* pPossibleValues; sal_Int32 nRangeIndex; sal_Int32 nCurrent; - + friend class StringRangeEnumerator; Iterator( const StringRangeEnumerator* i_pEnum, const std::set< sal_Int32 >* i_pPossibleValues, @@ -155,29 +155,29 @@ public: }; friend class StringRangeEnumerator::Iterator; - + StringRangeEnumerator() : mnCount( 0 ), mnMin( -1 ), mnMax( -1 ), mnOffset( -1 ) {} StringRangeEnumerator( const rtl::OUString& i_rInput, sal_Int32 i_nMinNumber = -1, sal_Int32 i_nMaxNumber = -1, sal_Int32 i_nLogicalOffset = -1 ); - + size_t size() const { return size_t(mnCount); } Iterator begin( const std::set< sal_Int32 >* i_pPossibleValues = NULL ) const; Iterator end( const std::set< sal_Int32 >* i_pPossibleValues = NULL ) const; - + sal_Int32 getMin() const { return mnMin; } void setMin( sal_Int32 i_nMinValue ) { mnMin = i_nMinValue; } sal_Int32 getMax() const { return mnMax; } void setMax( sal_Int32 i_nMaxValue ) { mnMax = i_nMaxValue; } sal_Int32 getLogicalOffset() const { return mnOffset; } void setLogicalOffset( sal_Int32 i_nOffset ) { mnOffset = i_nOffset; } - + bool setRange( const rtl::OUString& i_rNewRange, bool i_bStrict = false ); bool hasValue( sal_Int32 nValue, const std::set< sal_Int32 >* i_pPossibleValues = NULL ) const; - - + + /** i_rPageRange: the string to be changed into a sequence of numbers valid format example "5-3,9,9,7-8" ; instead of ',' ';' or ' ' are allowed as well @@ -188,10 +188,10 @@ public: so the logical offset would be -1 i_nMinNumber: the minimum allowed number, a negative number means no minimum check i_nMaxNumber: the maximum allowed number, a negative number means no maximum check - + @returns: true if the input string was valid, o_rPageVector will contain the resulting sequence false if the input string was invalid, o_rPageVector will be unchanged - + behavior: - only non-negative sequence numbers are allowed - only non-negative values in the input string are allowed @@ -213,4 +213,4 @@ public: ); }; -#endif // _SV_MULTISEL_HXX +#endif // _SV_MULTISEL_HXX diff --git a/tools/inc/tools/ownlist.hxx b/tools/inc/tools/ownlist.hxx index d84ad1be9ea1..ac99537a9f0d 100644 --- a/tools/inc/tools/ownlist.hxx +++ b/tools/inc/tools/ownlist.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,8 +53,8 @@ public: \ void Remove( ULONG nPos ) \ { delete (Type *)aTypes.Remove( nPos ); } \ Type & Insert( const Type &, ULONG nPos ); \ - Type & Insert( const Type & rType ) \ - { return Insert( rType, aTypes.GetCurPos() ); } \ + Type & Insert( const Type & rType ) \ + { return Insert( rType, aTypes.GetCurPos() ); } \ Type & Append( const Type & rType ) \ { return Insert( rType, LIST_APPEND ); } \ Type & GetObject( ULONG nPos ) const \ diff --git a/tools/inc/tools/pathutils.hxx b/tools/inc/tools/pathutils.hxx index db75397eb69e..e5c54b09fb4b 100644 --- a/tools/inc/tools/pathutils.hxx +++ b/tools/inc/tools/pathutils.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/poly.hxx b/tools/inc/tools/poly.hxx index fecd09da7765..b83877b88959 100644 --- a/tools/inc/tools/poly.hxx +++ b/tools/inc/tools/poly.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,17 +37,17 @@ // - Defines - // ----------- -#define POLY_APPEND (0xFFFF) -#define POLYPOLY_APPEND (0xFFFF) +#define POLY_APPEND (0xFFFF) +#define POLYPOLY_APPEND (0xFFFF) // ------------------------------------------------------------------------ -#define POLY_OPTIMIZE_NONE 0x00000000UL -#define POLY_OPTIMIZE_OPEN 0x00000001UL -#define POLY_OPTIMIZE_CLOSE 0x00000002UL -#define POLY_OPTIMIZE_NO_SAME 0x00000004UL -#define POLY_OPTIMIZE_REDUCE 0x00000008UL -#define POLY_OPTIMIZE_EDGES 0x00000010UL +#define POLY_OPTIMIZE_NONE 0x00000000UL +#define POLY_OPTIMIZE_OPEN 0x00000001UL +#define POLY_OPTIMIZE_CLOSE 0x00000002UL +#define POLY_OPTIMIZE_NO_SAME 0x00000004UL +#define POLY_OPTIMIZE_REDUCE 0x00000008UL +#define POLY_OPTIMIZE_EDGES 0x00000010UL // ------------- // - PolyStyle - @@ -83,9 +83,9 @@ class PolyOptimizeData { private: - enum DataType { DATA_NONE = 0, DATA_ABSOLUT = 1, DATA_PERCENT = 2 }; - DataType eType; - union { ULONG mnAbsolut; USHORT mnPercent; }; + enum DataType { DATA_NONE = 0, DATA_ABSOLUT = 1, DATA_PERCENT = 2 }; + DataType eType; + union { ULONG mnAbsolut; USHORT mnPercent; }; public: @@ -93,8 +93,8 @@ public: PolyOptimizeData( ULONG nAbsolut ) : eType( DATA_ABSOLUT ), mnAbsolut( nAbsolut ) {} PolyOptimizeData( USHORT nPercent ) : eType( DATA_PERCENT ), mnPercent( nPercent ) {} - ULONG GetAbsValue() const { DBG_ASSERT( eType == DATA_ABSOLUT, "Wrong data type" ); return mnAbsolut; } - USHORT GetPercentValue() const { DBG_ASSERT( eType == DATA_PERCENT, "Wrong data type" ); return mnPercent; } + ULONG GetAbsValue() const { DBG_ASSERT( eType == DATA_ABSOLUT, "Wrong data type" ); return mnAbsolut; } + USHORT GetPercentValue() const { DBG_ASSERT( eType == DATA_PERCENT, "Wrong data type" ); return mnPercent; } }; // ----------- @@ -104,10 +104,10 @@ public: class SvStream; class ImplPolygon; class ImplPolyPolygon; -class PolyPolygon; +class PolyPolygon; -namespace basegfx -{ +namespace basegfx +{ class B2DPolygon; class B2DPolyPolygon; } // end of namespace basegfx @@ -127,9 +127,9 @@ public: Point* ImplGetPointAry(); BYTE* ImplGetFlagAry(); - static void ImplReduceEdges( Polygon& rPoly, const double& rArea, USHORT nPercent ); - void ImplRead( SvStream& rIStream ); - void ImplWrite( SvStream& rOStream ) const; + static void ImplReduceEdges( Polygon& rPoly, const double& rArea, USHORT nPercent ); + void ImplRead( SvStream& rIStream ); + void ImplWrite( SvStream& rOStream ) const; //#endif // __PRIVATE @@ -139,7 +139,7 @@ public: Polygon( USHORT nPoints, const Point* pPtAry, const BYTE* pFlagAry = NULL ); Polygon( const Rectangle& rRect ); - Polygon( const Rectangle& rRect, + Polygon( const Rectangle& rRect, ULONG nHorzRound, ULONG nVertRound ); Polygon( const Point& rCenter, long nRadX, long nRadY, @@ -147,8 +147,8 @@ public: Polygon( const Rectangle& rBound, const Point& rStart, const Point& rEnd, PolyStyle ePolyStyle = POLY_ARC ); - Polygon( const Point& rBezPt1, const Point& rCtrlPt1, - const Point& rBezPt2, const Point& rCtrlPt2, + Polygon( const Point& rBezPt1, const Point& rCtrlPt1, + const Point& rBezPt2, const Point& rCtrlPt2, USHORT nPoints = 0 ); Polygon( const Polygon& rPoly ); @@ -159,11 +159,11 @@ public: void SetFlags( USHORT nPos, PolyFlags eFlags ); PolyFlags GetFlags( USHORT nPos ) const; - sal_Bool HasFlags() const; + sal_Bool HasFlags() const; BOOL IsControl( USHORT nPos ) const; BOOL IsSmooth( USHORT nPos ) const; - BOOL IsRect() const; + BOOL IsRect() const; void SetSize( USHORT nNewSize ); USHORT GetSize() const; @@ -177,7 +177,7 @@ public: BOOL IsRightOrientated() const; double CalcDistance( USHORT nPt1, USHORT nPt2 ); void Clip( const Rectangle& rRect, BOOL bPolygon = TRUE ); - void Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData = NULL ); + void Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData = NULL ); /** Adaptive subdivision of polygons with curves @@ -188,7 +188,7 @@ public: @param rResult The resulting subdivided polygon - @param d + @param d This parameter controls the amount of subdivision. The original curve is guaranteed to not differ by more than this amount per bezier segment from the subdivided @@ -197,12 +197,12 @@ public: the original polygon is guaranteed to be smaller than one pixel. */ - void AdaptiveSubdivide( Polygon& rResult, const double d = 1.0 ) const; + void AdaptiveSubdivide( Polygon& rResult, const double d = 1.0 ) const; - void GetIntersection( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; - void GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; - void GetDifference( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; - void GetXOR( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; + void GetIntersection( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; + void GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; + void GetDifference( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; + void GetXOR( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; void Move( long nHorzMove, long nVertMove ); void Translate( const Point& rTrans ); @@ -224,15 +224,15 @@ public: BOOL operator==( const Polygon& rPoly ) const; BOOL operator!=( const Polygon& rPoly ) const { return !(Polygon::operator==( rPoly )); } - sal_Bool IsEqual( const Polygon& rPoly ) const; + sal_Bool IsEqual( const Polygon& rPoly ) const; // streaming a Polygon does ignore PolyFlags, so use the Write Or Read // method to take care of PolyFlags TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Polygon& rPoly ); TOOLS_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStream, const Polygon& rPoly ); - void Read( SvStream& rIStream ); - void Write( SvStream& rOStream ) const; + void Read( SvStream& rIStream ); + void Write( SvStream& rOStream ) const; const Point* GetConstPointAry() const; const BYTE* GetConstFlagAry() const; @@ -275,14 +275,14 @@ public: void Replace( const Polygon& rPoly, USHORT nPos ); const Polygon& GetObject( USHORT nPos ) const; - BOOL IsRect() const; + BOOL IsRect() const; void Clear(); USHORT Count() const; Rectangle GetBoundRect() const; void Clip( const Rectangle& rRect ); - void Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData = NULL ); + void Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData = NULL ); /** Adaptive subdivision of polygons with curves @@ -293,7 +293,7 @@ public: @param rResult The resulting subdivided polygon - @param d + @param d This parameter controls the amount of subdivision. The original curve is guaranteed to not differ by more than this amount per bezier segment from the subdivided @@ -302,12 +302,12 @@ public: the original polygon is guaranteed to be smaller than one pixel. */ - void AdaptiveSubdivide( PolyPolygon& rResult, const double d = 1.0 ) const; + void AdaptiveSubdivide( PolyPolygon& rResult, const double d = 1.0 ) const; - void GetIntersection( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; - void GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; - void GetDifference( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; - void GetXOR( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; + void GetIntersection( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; + void GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; + void GetDifference( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; + void GetXOR( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; void Move( long nHorzMove, long nVertMove ); void Translate( const Point& rTrans ); @@ -326,13 +326,13 @@ public: BOOL operator!=( const PolyPolygon& rPolyPoly ) const { return !(PolyPolygon::operator==( rPolyPoly )); } - sal_Bool IsEqual( const PolyPolygon& rPolyPoly ) const; + sal_Bool IsEqual( const PolyPolygon& rPolyPoly ) const; TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, PolyPolygon& rPolyPoly ); TOOLS_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStream, const PolyPolygon& rPolyPoly ); - void Read( SvStream& rIStream ); - void Write( SvStream& rOStream ) const; + void Read( SvStream& rIStream ); + void Write( SvStream& rOStream ) const; // convert to ::basegfx::B2DPolyPolygon and return ::basegfx::B2DPolyPolygon getB2DPolyPolygon() const; diff --git a/tools/inc/tools/postextstl.h b/tools/inc/tools/postextstl.h index efbdaddbaacc..81a21e25c15b 100644 --- a/tools/inc/tools/postextstl.h +++ b/tools/inc/tools/postextstl.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/postsys.h b/tools/inc/tools/postsys.h index 0864d09e3f74..3b7e37a4c23b 100644 --- a/tools/inc/tools/postsys.h +++ b/tools/inc/tools/postsys.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #undef DELETE /* Hilfe-Ids umbenennen */ -#define WIN_HELP_INDEX 0x0003 +#define WIN_HELP_INDEX 0x0003 #define WIN_HELP_HELPONHELP 0x0004 #undef HELP_INDEX #undef HELP_HELPONHELP @@ -46,86 +46,86 @@ #define WIN_MOUSE_MOVED 0x0001 #undef MOUSE_MOVED -#define WIN_WB_LEFT 0 -#define WIN_WB_RIGHT 1 +#define WIN_WB_LEFT 0 +#define WIN_WB_RIGHT 1 #undef WB_LEFT #undef WB_RIGHT #ifdef GetObject #undef GetObject #ifdef UNICODE -#define WIN_GetObject GetObjectW +#define WIN_GetObject GetObjectW #else -#define WIN_GetObject GetObjectA +#define WIN_GetObject GetObjectA #endif #else -#define WIN_GetObject GetObject +#define WIN_GetObject GetObject #endif #ifdef SetPrinter #undef SetPrinter #ifdef UNICODE -#define WIN_SetPrinter SetPrinterW +#define WIN_SetPrinter SetPrinterW #else -#define WIN_SetPrinter SetPrinterA +#define WIN_SetPrinter SetPrinterA #endif #else -#define WIN_SetPrinter SetPrinter +#define WIN_SetPrinter SetPrinter #endif #ifdef GetPrinter #undef GetPrinter #ifdef UNICODE -#define WIN_GetPrinter GetPrinterW +#define WIN_GetPrinter GetPrinterW #else -#define WIN_GetPrinter GetPrinterA +#define WIN_GetPrinter GetPrinterA #endif #else -#define WIN_GetPrinter GetPrinter +#define WIN_GetPrinter GetPrinter #endif #ifdef DrawText #undef DrawText #ifdef UNICODE -#define WIN_DrawText DrawTextW +#define WIN_DrawText DrawTextW #else -#define WIN_DrawText DrawTextA +#define WIN_DrawText DrawTextA #endif #else -#define WIN_DrawText DrawText +#define WIN_DrawText DrawText #endif #ifdef mciSetCommand #undef mciSetCommand #ifdef UNICODE -#define WIN_mciSetCommand mciSetCommandW +#define WIN_mciSetCommand mciSetCommandW #else -#define WIN_mciSetCommand mciSetCommandA +#define WIN_mciSetCommand mciSetCommandA #endif #else -#define mciSetCommand mciSetCommand +#define mciSetCommand mciSetCommand #endif #ifdef SetPort #undef SetPort #ifdef UNICODE -#define WIN_SetPort SetPortW +#define WIN_SetPort SetPortW #else -#define WIN_SetPort SetPortA +#define WIN_SetPort SetPortA #endif #else -#define WIN_SetPort SetPort +#define WIN_SetPort SetPort #endif #ifdef CopyFile #undef CopyFile #ifdef UNICODE -#define WIN_CopyFile CopyFileW +#define WIN_CopyFile CopyFileW #else -#define WIN_CopyFile CopyFileA +#define WIN_CopyFile CopyFileA #endif #else -#define WIN_CopyFile CopyFile +#define WIN_CopyFile CopyFile #endif #ifdef GetUserName @@ -221,13 +221,13 @@ /* new StretchBlt() Modes (simpler names) */ #ifndef STRETCH_ANDSCANS -#define STRETCH_ANDSCANS 1 +#define STRETCH_ANDSCANS 1 #endif #ifndef STRETCH_ORSCANS -#define STRETCH_ORSCANS 2 +#define STRETCH_ORSCANS 2 #endif #ifndef STRETCH_DELETESCANS -#define STRETCH_DELETESCANS 3 +#define STRETCH_DELETESCANS 3 #endif extern "C" diff --git a/tools/inc/tools/postwin.h b/tools/inc/tools/postwin.h index 4e7c334e3871..a6bd3431a9dc 100644 --- a/tools/inc/tools/postwin.h +++ b/tools/inc/tools/postwin.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ #undef GradientStyle_RECT /* Hilfe-Ids umbenennen */ -#define WIN_HELP_INDEX 0x0003 +#define WIN_HELP_INDEX 0x0003 #define WIN_HELP_HELPONHELP 0x0004 #undef HELP_INDEX #undef HELP_HELPONHELP @@ -59,86 +59,86 @@ #define WIN_MOUSE_MOVED 0x0001 #undef MOUSE_MOVED -#define WIN_WB_LEFT 0 -#define WIN_WB_RIGHT 1 +#define WIN_WB_LEFT 0 +#define WIN_WB_RIGHT 1 #undef WB_LEFT #undef WB_RIGHT #ifdef GetObject #undef GetObject #ifdef UNICODE -#define WIN_GetObject GetObjectW +#define WIN_GetObject GetObjectW #else -#define WIN_GetObject GetObjectA +#define WIN_GetObject GetObjectA #endif #else -#define WIN_GetObject GetObject +#define WIN_GetObject GetObject #endif #ifdef SetPrinter #undef SetPrinter #ifdef UNICODE -#define WIN_SetPrinter SetPrinterW +#define WIN_SetPrinter SetPrinterW #else -#define WIN_SetPrinter SetPrinterA +#define WIN_SetPrinter SetPrinterA #endif #else -#define WIN_SetPrinter SetPrinter +#define WIN_SetPrinter SetPrinter #endif #ifdef GetPrinter #undef GetPrinter #ifdef UNICODE -#define WIN_GetPrinter GetPrinterW +#define WIN_GetPrinter GetPrinterW #else -#define WIN_GetPrinter GetPrinterA +#define WIN_GetPrinter GetPrinterA #endif #else -#define WIN_GetPrinter GetPrinter +#define WIN_GetPrinter GetPrinter #endif #ifdef DrawText #undef DrawText #ifdef UNICODE -#define WIN_DrawText DrawTextW +#define WIN_DrawText DrawTextW #else -#define WIN_DrawText DrawTextA +#define WIN_DrawText DrawTextA #endif #else -#define WIN_DrawText DrawText +#define WIN_DrawText DrawText #endif #ifdef mciSetCommand #undef mciSetCommand #ifdef UNICODE -#define WIN_mciSetCommand mciSetCommandW +#define WIN_mciSetCommand mciSetCommandW #else -#define WIN_mciSetCommand mciSetCommandA +#define WIN_mciSetCommand mciSetCommandA #endif #else -#define mciSetCommand mciSetCommand +#define mciSetCommand mciSetCommand #endif #ifdef SetPort #undef SetPort #ifdef UNICODE -#define WIN_SetPort SetPortW +#define WIN_SetPort SetPortW #else -#define WIN_SetPort SetPortA +#define WIN_SetPort SetPortA #endif #else -#define WIN_SetPort SetPort +#define WIN_SetPort SetPort #endif #ifdef CopyFile #undef CopyFile #ifdef UNICODE -#define WIN_CopyFile CopyFileW +#define WIN_CopyFile CopyFileW #else -#define WIN_CopyFile CopyFileA +#define WIN_CopyFile CopyFileA #endif #else -#define WIN_CopyFile CopyFile +#define WIN_CopyFile CopyFile #endif @@ -235,13 +235,13 @@ /* new StretchBlt() Modes (simpler names) */ #ifndef STRETCH_ANDSCANS -#define STRETCH_ANDSCANS 1 +#define STRETCH_ANDSCANS 1 #endif #ifndef STRETCH_ORSCANS -#define STRETCH_ORSCANS 2 +#define STRETCH_ORSCANS 2 #endif #ifndef STRETCH_DELETESCANS -#define STRETCH_DELETESCANS 3 +#define STRETCH_DELETESCANS 3 #endif #ifdef WNT diff --git a/tools/inc/tools/postx.h b/tools/inc/tools/postx.h index 776b7f0858a1..3e77fde5d14b 100644 --- a/tools/inc/tools/postx.h +++ b/tools/inc/tools/postx.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/preextstl.h b/tools/inc/tools/preextstl.h index 3f59c5613c03..27aed38686f0 100644 --- a/tools/inc/tools/preextstl.h +++ b/tools/inc/tools/preextstl.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/presys.h b/tools/inc/tools/presys.h index 0fdfbe21e321..457b57142dcd 100644 --- a/tools/inc/tools/presys.h +++ b/tools/inc/tools/presys.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/prewin.h b/tools/inc/tools/prewin.h index f705261e7103..43a4452594cc 100644 --- a/tools/inc/tools/prewin.h +++ b/tools/inc/tools/prewin.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,10 +32,10 @@ #define BOOL WIN_BOOL #define BYTE WIN_BYTE #ifndef VCL_NEED_BASETSD -#define INT64 WIN_INT64 -#define UINT64 WIN_UINT64 -#define INT32 WIN_INT32 -#define UINT32 WIN_UINT32 +#define INT64 WIN_INT64 +#define UINT64 WIN_UINT64 +#define INT32 WIN_INT32 +#define UINT32 WIN_UINT32 #endif #define Rectangle BLA_Rectangle @@ -43,7 +43,7 @@ #define PolyPolygon BLA_PolyPolygon #define Region WIN_Region #define Folder WIN_Folder -#define GradientStyle_RECT WIN_GradientStyle_RECT +#define GradientStyle_RECT WIN_GradientStyle_RECT #ifdef __cplusplus extern "C" { diff --git a/tools/inc/tools/prex.h b/tools/inc/tools/prex.h index b9e68332ba13..61088960bbfd 100644 --- a/tools/inc/tools/prex.h +++ b/tools/inc/tools/prex.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,20 +28,20 @@ #ifndef _PREX_H #define _PREX_H -#define Window XLIB_Window -#define BYTE XLIB_BYTE -#define INT8 XLIB_INT8 +#define Window XLIB_Window +#define BYTE XLIB_BYTE +#define INT8 XLIB_INT8 #define INT64 XLIB_INT64 -#define BOOL XLIB_BOOL -#define Font XLIB_Font -#define Cursor XLIB_Cursor -#define String XLIB_String -#define KeyCode XLIB_KeyCode -#define Region XLIB_Region -#define Icon XLIB_Icon -#define Time XLIB_Time -#define Region XLIB_Region -#define Boolean XLIB_Boolean +#define BOOL XLIB_BOOL +#define Font XLIB_Font +#define Cursor XLIB_Cursor +#define String XLIB_String +#define KeyCode XLIB_KeyCode +#define Region XLIB_Region +#define Icon XLIB_Icon +#define Time XLIB_Time +#define Region XLIB_Region +#define Boolean XLIB_Boolean #if defined __cplusplus extern "C" { @@ -64,13 +64,13 @@ extern "C" { typedef unsigned long Pixel; #undef DestroyAll -#define DestroyAll XLIB_DestroyAll -#define XLIB_DestroyAll 0 +#define DestroyAll XLIB_DestroyAll +#define XLIB_DestroyAll 0 #undef String -#define String XLIB_String +#define String XLIB_String #undef KeyCode -#define KeyCode XLIB_KeyCode //undef in intrinsics +#define KeyCode XLIB_KeyCode //undef in intrinsics #define __Ol_OlXlibExt_h__ diff --git a/tools/inc/tools/pstm.hxx b/tools/inc/tools/pstm.hxx index 4fc00cfd1ef6..0d14385e5f08 100644 --- a/tools/inc/tools/pstm.hxx +++ b/tools/inc/tools/pstm.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -170,7 +170,7 @@ DECLARE_UNIQUEINDEX( SvPersistUIdx,SvPersistBase *) //========================================================================= class SvStream; class TOOLS_DLLPUBLIC SvPersistStream : public SvStream -/* [Beschreibung] +/* [Beschreibung] Mit dieser Klasse k"onnen Laufzeit Objektstrukturen gespeichert und geladen werden. Es m"ussen immer alle beteiligten Objekte @@ -194,11 +194,11 @@ class TOOLS_DLLPUBLIC SvPersistStream : public SvStream Die Reihenfolge beim Speichern und Laden ist egal, sie muss nur gleich sein: - Speichern: Laden: - A,B,C,D A,B,C,D richtig - B,A,C,D B,A,C,D richtig - C,A,B,D A,B,C,D falsch - A,B,C,D A,B,C falsch + Speichern: Laden: + A,B,C,D A,B,C,D richtig + B,A,C,D B,A,C,D richtig + C,A,B,D A,B,C,D falsch + A,B,C,D A,B,C falsch [Anmerkung] @@ -223,8 +223,8 @@ protected: ULONG GetCurMaxIndex() const { return GetCurMaxIndex( aPUIdx ); } - void WriteObj( BYTE nHdr, SvPersistBase * pObj ); - UINT32 ReadObj( SvPersistBase * & rpObj, + void WriteObj( BYTE nHdr, SvPersistBase * pObj ); + UINT32 ReadObj( SvPersistBase * & rpObj, BOOL bRegister ); public: BOOL IsStreamed( SvPersistBase * pObj ) const @@ -238,8 +238,8 @@ public: ~SvPersistStream(); void SetStream( SvStream * pStream ); - SvStream * GetStream() const { return pStm; } - virtual USHORT IsA() const; + SvStream * GetStream() const { return pStm; } + virtual USHORT IsA() const; SvPersistBase * GetObject( ULONG nIdx ) const; ULONG GetIndex( SvPersistBase * ) const; @@ -263,8 +263,8 @@ public: // gespeichert werden. friend SvStream& operator >> ( SvStream &, SvPersistStream & ); friend SvStream& operator << ( SvStream &, SvPersistStream & ); - ULONG InsertObj( SvPersistBase * ); - ULONG RemoveObj( SvPersistBase * ); + ULONG InsertObj( SvPersistBase * ); + ULONG RemoveObj( SvPersistBase * ); }; #endif // _PSTM_HXX diff --git a/tools/inc/tools/queue.hxx b/tools/inc/tools/queue.hxx index 197bfef0f86d..cb89bce6cdda 100644 --- a/tools/inc/tools/queue.hxx +++ b/tools/inc/tools/queue.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/rc.h b/tools/inc/tools/rc.h index 01926dd48cb1..bd499717a3a4 100644 --- a/tools/inc/tools/rc.h +++ b/tools/inc/tools/rc.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,189 +32,189 @@ // Definition der Struktur die alle "Window"-Resourcen haben // Hier sind die Fensterstyles definiert die nicht in WinBits sind -#define RSC_EXTRAMAPUNIT 0xFFFF //Wert nicht veraendern!!! +#define RSC_EXTRAMAPUNIT 0xFFFF //Wert nicht veraendern!!! typedef short RSWND_STYLE; -#define RSWND_DISABLED 0x01 -#define RSWND_CLIENTSIZE 0x02 - -#define WINDOW_XYMAPMODE 0x0001 -#define WINDOW_X 0x0002 -#define WINDOW_Y 0x0004 -#define WINDOW_WHMAPMODE 0x0008 -#define WINDOW_WIDTH 0x0010 -#define WINDOW_HEIGHT 0x0020 -#define WINDOW_TEXT 0x0080 -#define WINDOW_HELPTEXT 0x0100 -#define WINDOW_QUICKTEXT 0x0200 -#define WINDOW_EXTRALONG 0x0800 -#define WINDOW_UNIQUEID 0x1000 +#define RSWND_DISABLED 0x01 +#define RSWND_CLIENTSIZE 0x02 + +#define WINDOW_XYMAPMODE 0x0001 +#define WINDOW_X 0x0002 +#define WINDOW_Y 0x0004 +#define WINDOW_WHMAPMODE 0x0008 +#define WINDOW_WIDTH 0x0010 +#define WINDOW_HEIGHT 0x0020 +#define WINDOW_TEXT 0x0080 +#define WINDOW_HELPTEXT 0x0100 +#define WINDOW_QUICKTEXT 0x0200 +#define WINDOW_EXTRALONG 0x0800 +#define WINDOW_UNIQUEID 0x1000 #define WINDOW_BORDER_STYLE 0x2000 // Definition der Struktur die alle "WorkWindow"-Resourcen haben -#define WORKWIN_SHOWNORMAL 0 -#define WORKWIN_SHOWMINIMIZED 1 -#define WORKWIN_SHOWMAXIMIZED 2 +#define WORKWIN_SHOWNORMAL 0 +#define WORKWIN_SHOWMINIMIZED 1 +#define WORKWIN_SHOWMAXIMIZED 2 // Definition der Struktur der FixedBitmap-Resource. -#define RSC_FIXEDBITMAP_BITMAP 0x0001 +#define RSC_FIXEDBITMAP_BITMAP 0x0001 // Definition der Struktur der FixedImage-Resource. -#define RSC_FIXEDIMAGE_IMAGE 0x0001 +#define RSC_FIXEDIMAGE_IMAGE 0x0001 // Definition der Struktur des MenuButtons -#define RSCMENUBUTTON_MENU 0x01 +#define RSCMENUBUTTON_MENU 0x01 // Definition der Struktur die alle Menu-Resourcen haben -#define RSC_MENU_ITEMS 0x01 -#define RSC_MENU_TEXT 0x02 -#define RSC_MENU_DEFAULTITEMID 0x04 +#define RSC_MENU_ITEMS 0x01 +#define RSC_MENU_TEXT 0x02 +#define RSC_MENU_DEFAULTITEMID 0x04 // Hier sind die MenuItem-Resourceoptionen definiert -#define RSC_MENUITEM_SEPARATOR 0x001 -#define RSC_MENUITEM_ID 0x002 -#define RSC_MENUITEM_STATUS 0x004 -#define RSC_MENUITEM_TEXT 0x008 -#define RSC_MENUITEM_BITMAP 0x010 -#define RSC_MENUITEM_HELPTEXT 0x020 -#define RSC_MENUITEM_HELPID 0x040 -#define RSC_MENUITEM_KEYCODE 0x080 -#define RSC_MENUITEM_MENU 0x100 -#define RSC_MENUITEM_CHECKED 0x200 -#define RSC_MENUITEM_DISABLE 0x400 -#define RSC_MENUITEM_COMMAND 0x800 +#define RSC_MENUITEM_SEPARATOR 0x001 +#define RSC_MENUITEM_ID 0x002 +#define RSC_MENUITEM_STATUS 0x004 +#define RSC_MENUITEM_TEXT 0x008 +#define RSC_MENUITEM_BITMAP 0x010 +#define RSC_MENUITEM_HELPTEXT 0x020 +#define RSC_MENUITEM_HELPID 0x040 +#define RSC_MENUITEM_KEYCODE 0x080 +#define RSC_MENUITEM_MENU 0x100 +#define RSC_MENUITEM_CHECKED 0x200 +#define RSC_MENUITEM_DISABLE 0x400 +#define RSC_MENUITEM_COMMAND 0x800 // Hier sind die AccelKey-Resourceoptionen definiert -#define ACCELITEM_ACCEL 0x01 -#define ACCELITEM_KEY 0x02 +#define ACCELITEM_ACCEL 0x01 +#define ACCELITEM_KEY 0x02 // Definition der Struktur die alle "Field"-Resourcen haben -#define PATTERNFORMATTER_STRICTFORMAT 0x01 -#define PATTERNFORMATTER_EDITMASK 0x02 -#define PATTERNFORMATTER_LITTERALMASK 0x04 - -#define NUMERICFORMATTER_MIN 0x01 -#define NUMERICFORMATTER_MAX 0x02 -#define NUMERICFORMATTER_STRICTFORMAT 0x04 -//#define NUMERICFORMATTER_I12 0x08 // erAck: got rid of class International (2005-06-17) -#define NUMERICFORMATTER_DECIMALDIGITS 0x10 -#define NUMERICFORMATTER_VALUE 0x20 +#define PATTERNFORMATTER_STRICTFORMAT 0x01 +#define PATTERNFORMATTER_EDITMASK 0x02 +#define PATTERNFORMATTER_LITTERALMASK 0x04 + +#define NUMERICFORMATTER_MIN 0x01 +#define NUMERICFORMATTER_MAX 0x02 +#define NUMERICFORMATTER_STRICTFORMAT 0x04 +//#define NUMERICFORMATTER_I12 0x08 // erAck: got rid of class International (2005-06-17) +#define NUMERICFORMATTER_DECIMALDIGITS 0x10 +#define NUMERICFORMATTER_VALUE 0x20 #define NUMERICFORMATTER_NOTHOUSANDSEP 0x40 -#define METRICFORMATTER_UNIT 0x01 -#define METRICFORMATTER_CUSTOMUNITTEXT 0x02 +#define METRICFORMATTER_UNIT 0x01 +#define METRICFORMATTER_CUSTOMUNITTEXT 0x02 -#define DATEFORMATTER_MIN 0x01 -#define DATEFORMATTER_MAX 0x02 -#define DATEFORMATTER_LONGFORMAT 0x04 -#define DATEFORMATTER_STRICTFORMAT 0x08 -//#define DATEFORMATTER_I12 0x10 // erAck: got rid of class International (2005-06-17) -#define DATEFORMATTER_VALUE 0x20 +#define DATEFORMATTER_MIN 0x01 +#define DATEFORMATTER_MAX 0x02 +#define DATEFORMATTER_LONGFORMAT 0x04 +#define DATEFORMATTER_STRICTFORMAT 0x08 +//#define DATEFORMATTER_I12 0x10 // erAck: got rid of class International (2005-06-17) +#define DATEFORMATTER_VALUE 0x20 -#define TIMEFORMATTER_MIN 0x01 -#define TIMEFORMATTER_MAX 0x02 -#define TIMEFORMATTER_TIMEFIELDFORMAT 0x04 -#define TIMEFORMATTER_DURATION 0x08 -#define TIMEFORMATTER_STRICTFORMAT 0x10 -//#define TIMEFORMATTER_I12 0x20 // erAck: got rid of class International (2005-06-17) -#define TIMEFORMATTER_VALUE 0x40 +#define TIMEFORMATTER_MIN 0x01 +#define TIMEFORMATTER_MAX 0x02 +#define TIMEFORMATTER_TIMEFIELDFORMAT 0x04 +#define TIMEFORMATTER_DURATION 0x08 +#define TIMEFORMATTER_STRICTFORMAT 0x10 +//#define TIMEFORMATTER_I12 0x20 // erAck: got rid of class International (2005-06-17) +#define TIMEFORMATTER_VALUE 0x40 -#define NUMERICFIELD_FIRST 0x01 -#define NUMERICFIELD_LAST 0x02 -#define NUMERICFIELD_SPINSIZE 0x04 +#define NUMERICFIELD_FIRST 0x01 +#define NUMERICFIELD_LAST 0x02 +#define NUMERICFIELD_SPINSIZE 0x04 -#define METRICFIELD_FIRST 0x01 -#define METRICFIELD_LAST 0x02 -#define METRICFIELD_SPINSIZE 0x04 +#define METRICFIELD_FIRST 0x01 +#define METRICFIELD_LAST 0x02 +#define METRICFIELD_SPINSIZE 0x04 -#define CURRENCYFIELD_FIRST 0x01 -#define CURRENCYFIELD_LAST 0x02 -#define CURRENCYFIELD_SPINSIZE 0x04 +#define CURRENCYFIELD_FIRST 0x01 +#define CURRENCYFIELD_LAST 0x02 +#define CURRENCYFIELD_SPINSIZE 0x04 -#define DATEFIELD_FIRST 0x01 -#define DATEFIELD_LAST 0x02 +#define DATEFIELD_FIRST 0x01 +#define DATEFIELD_LAST 0x02 -#define TIMEFIELD_FIRST 0x01 -#define TIMEFIELD_LAST 0x02 +#define TIMEFIELD_FIRST 0x01 +#define TIMEFIELD_LAST 0x02 // Definition der Struktur die alle "ToolBoxItem"-Resourcen haben -#define RSC_TOOLBOXITEM_ID 0x0001 -#define RSC_TOOLBOXITEM_TYPE 0x0002 -#define RSC_TOOLBOXITEM_STATUS 0x0004 -#define RSC_TOOLBOXITEM_HELPID 0x0008 -#define RSC_TOOLBOXITEM_TEXT 0x0010 -#define RSC_TOOLBOXITEM_HELPTEXT 0x0020 -#define RSC_TOOLBOXITEM_BITMAP 0x0040 -#define RSC_TOOLBOXITEM_IMAGE 0x0080 -#define RSC_TOOLBOXITEM_DISABLE 0x0100 -#define RSC_TOOLBOXITEM_STATE 0x0200 -#define RSC_TOOLBOXITEM_HIDE 0x0400 -#define RSC_TOOLBOXITEM_COMMAND 0x0800 -#define RSC_TOOLBOXITEM_MENUSTRINGS 0x1000 +#define RSC_TOOLBOXITEM_ID 0x0001 +#define RSC_TOOLBOXITEM_TYPE 0x0002 +#define RSC_TOOLBOXITEM_STATUS 0x0004 +#define RSC_TOOLBOXITEM_HELPID 0x0008 +#define RSC_TOOLBOXITEM_TEXT 0x0010 +#define RSC_TOOLBOXITEM_HELPTEXT 0x0020 +#define RSC_TOOLBOXITEM_BITMAP 0x0040 +#define RSC_TOOLBOXITEM_IMAGE 0x0080 +#define RSC_TOOLBOXITEM_DISABLE 0x0100 +#define RSC_TOOLBOXITEM_STATE 0x0200 +#define RSC_TOOLBOXITEM_HIDE 0x0400 +#define RSC_TOOLBOXITEM_COMMAND 0x0800 +#define RSC_TOOLBOXITEM_MENUSTRINGS 0x1000 // Definition der Struktur die alle ToolBox-Resourcen haben -#define RSC_TOOLBOX_BUTTONTYPE 0x01 -#define RSC_TOOLBOX_ALIGN 0x02 -#define RSC_TOOLBOX_LINECOUNT 0x04 -#define RSC_TOOLBOX_FLOATLINES 0x08 -#define RSC_TOOLBOX_CUSTOMIZE 0x10 -#define RSC_TOOLBOX_MENUSTRINGS 0x20 -#define RSC_TOOLBOX_ITEMIMAGELIST 0x40 -#define RSC_TOOLBOX_ITEMLIST 0x80 +#define RSC_TOOLBOX_BUTTONTYPE 0x01 +#define RSC_TOOLBOX_ALIGN 0x02 +#define RSC_TOOLBOX_LINECOUNT 0x04 +#define RSC_TOOLBOX_FLOATLINES 0x08 +#define RSC_TOOLBOX_CUSTOMIZE 0x10 +#define RSC_TOOLBOX_MENUSTRINGS 0x20 +#define RSC_TOOLBOX_ITEMIMAGELIST 0x40 +#define RSC_TOOLBOX_ITEMLIST 0x80 // Definition der Struktur die alle MoreButton-Resourcen haben -#define RSC_MOREBUTTON_STATE 0x01 -#define RSC_MOREBUTTON_MAPUNIT 0x02 -#define RSC_MOREBUTTON_DELTA 0x04 +#define RSC_MOREBUTTON_STATE 0x01 +#define RSC_MOREBUTTON_MAPUNIT 0x02 +#define RSC_MOREBUTTON_DELTA 0x04 // Definition der Struktur die alle FloatingWindow-Resourcen haben -#define RSC_FLOATINGWINDOW_WHMAPMODE 0x01 -#define RSC_FLOATINGWINDOW_WIDTH 0x02 -#define RSC_FLOATINGWINDOW_HEIGHT 0x04 -#define RSC_FLOATINGWINDOW_ZOOMIN 0x08 +#define RSC_FLOATINGWINDOW_WHMAPMODE 0x01 +#define RSC_FLOATINGWINDOW_WIDTH 0x02 +#define RSC_FLOATINGWINDOW_HEIGHT 0x04 +#define RSC_FLOATINGWINDOW_ZOOMIN 0x08 // Definition der Struktur die alle DockingWindow-Resourcen haben -#define RSC_DOCKINGWINDOW_XYMAPMODE 0x01 -#define RSC_DOCKINGWINDOW_X 0x02 -#define RSC_DOCKINGWINDOW_Y 0x04 -#define RSC_DOCKINGWINDOW_FLOATING 0x08 +#define RSC_DOCKINGWINDOW_XYMAPMODE 0x01 +#define RSC_DOCKINGWINDOW_X 0x02 +#define RSC_DOCKINGWINDOW_Y 0x04 +#define RSC_DOCKINGWINDOW_FLOATING 0x08 // Definition der Struktur die alle "TabControlItem"-Resourcen haben -#define RSC_TABCONTROLITEM_ID 0x0001 -#define RSC_TABCONTROLITEM_TEXT 0x0002 -#define RSC_TABCONTROLITEM_PAGERESID 0x0008 +#define RSC_TABCONTROLITEM_ID 0x0001 +#define RSC_TABCONTROLITEM_TEXT 0x0002 +#define RSC_TABCONTROLITEM_PAGERESID 0x0008 // Definition der Struktur die alle TabControl-Resourcen haben -#define RSC_TABCONTROL_ITEMLIST 0x01 +#define RSC_TABCONTROL_ITEMLIST 0x01 // Definition der Struktur des ImageButtons -#define RSC_IMAGEBUTTON_IMAGE 0x01 -#define RSC_IMAGEBUTTON_SYMBOL 0x02 -#define RSC_IMAGEBUTTON_STATE 0x04 +#define RSC_IMAGEBUTTON_IMAGE 0x01 +#define RSC_IMAGEBUTTON_SYMBOL 0x02 +#define RSC_IMAGEBUTTON_STATE 0x04 // Definition der Struktur des ImageRadioButtons -#define RSC_IMAGERADIOBUTTON_IMAGE 0x01 +#define RSC_IMAGERADIOBUTTON_IMAGE 0x01 // Definition der Struktur des Image -#define RSC_IMAGE_IMAGEBITMAP 0x01 -#define RSC_IMAGE_MASKBITMAP 0x02 -#define RSC_IMAGE_MASKCOLOR 0x04 +#define RSC_IMAGE_IMAGEBITMAP 0x01 +#define RSC_IMAGE_MASKBITMAP 0x02 +#define RSC_IMAGE_MASKCOLOR 0x04 // Definition der Struktur des Image -#define RSC_IMAGELIST_IMAGEBITMAP 0x01 -#define RSC_IMAGELIST_MASKBITMAP 0x02 -#define RSC_IMAGELIST_MASKCOLOR 0x04 -#define RSC_IMAGELIST_IDLIST 0x08 -#define RSC_IMAGELIST_IDCOUNT 0x10 +#define RSC_IMAGELIST_IMAGEBITMAP 0x01 +#define RSC_IMAGELIST_MASKBITMAP 0x02 +#define RSC_IMAGELIST_MASKCOLOR 0x04 +#define RSC_IMAGELIST_IDLIST 0x08 +#define RSC_IMAGELIST_IDCOUNT 0x10 // obsolete, should be removed by MM -#define RSC_COLOR (RSC_NOTYPE + 0x16) -#define TIME_HOUR 0x01 -#define TIME_MINUTE 0x02 -#define TIME_SECOND 0x04 -#define TIME_SEC100 0x08 -#define DATE_YEAR 0x01 -#define DATE_MONTH 0x02 -#define DATE_DAY 0x04 +#define RSC_COLOR (RSC_NOTYPE + 0x16) +#define TIME_HOUR 0x01 +#define TIME_MINUTE 0x02 +#define TIME_SECOND 0x04 +#define TIME_SEC100 0x08 +#define DATE_YEAR 0x01 +#define DATE_MONTH 0x02 +#define DATE_DAY 0x04 #endif // _TOOLS_RC_H diff --git a/tools/inc/tools/rc.hxx b/tools/inc/tools/rc.hxx index 1fd6dfd6b5a2..4bf1827a1ab6 100644 --- a/tools/inc/tools/rc.hxx +++ b/tools/inc/tools/rc.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,44 +40,44 @@ class TOOLS_DLLPUBLIC Resource { protected: ResMgr* m_pResMgr; - + // check availability of Resource - BOOL IsAvailableRes( const ResId& rId ) const + BOOL IsAvailableRes( const ResId& rId ) const { return m_pResMgr->IsAvailable( rId, this ); } // Load a Resource - void GetRes( const ResId& rResId ); - + void GetRes( const ResId& rResId ); + // check Resource state - void TestRes(); - + void TestRes(); + // Get a pointer to the Resource's data void* GetClassRes() { return m_pResMgr->GetClass(); } - + // read a string from the resource - static sal_uInt32 GetStringRes( UniString& rStr, const BYTE* pStr ) + static sal_uInt32 GetStringRes( UniString& rStr, const BYTE* pStr ) { return ResMgr::GetString( rStr, pStr ); } - + // increase the memory pointer gotten by GetClassRes() void* IncrementRes( sal_uInt32 nBytes ) { return m_pResMgr->Increment( nBytes ); } - + // return the memory size of a Resource data block - static sal_uInt32 GetObjSizeRes( RSHEADER_TYPE * pHT ) + static sal_uInt32 GetObjSizeRes( RSHEADER_TYPE * pHT ) { return ResMgr::GetObjSize( pHT ); } - + // return the remaining size of this Resource's data sal_uInt32 GetRemainSizeRes() { return m_pResMgr->GetRemainSize(); } - + // get a 32bit value from Resource data - static sal_Int32 GetLongRes( void * pLong ) + static sal_Int32 GetLongRes( void * pLong ) { return ResMgr::GetLong( pLong ); } // get a 16bit value from Resource data - static sal_Int16 GetShortRes( void * pShort ) + static sal_Int16 GetShortRes( void * pShort ) { return ResMgr::GetShort( pShort ); } - + // read a 32bit value from resource data and increment pointer sal_Int32 ReadLongRes() { return m_pResMgr->ReadLong(); } @@ -87,16 +87,16 @@ class TOOLS_DLLPUBLIC Resource // read a string from resource data and increment pointer UniString ReadStringRes() { return m_pResMgr->ReadString(); } - + // Gibt die Resource frei (this-Zeiger fuer Fehlerueberpruefung) // free the resource from m_pResMgr's stack (pass this ptr for validation) void FreeResource() { m_pResMgr->PopContext( this ); } - + // constructors Resource() : m_pResMgr( NULL ) {} Resource( const ResId& rResId ); - + public: #ifdef DBG_UTIL ~Resource() { TestRes(); } diff --git a/tools/inc/tools/rcid.h b/tools/inc/tools/rcid.h index e9eadfb02b58..3daf64c547a7 100644 --- a/tools/inc/tools/rcid.h +++ b/tools/inc/tools/rcid.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,103 +31,103 @@ #include <tools/resid.hxx> // Definition der Versionsnummer -#define RSCVERSION_ID 200U +#define RSCVERSION_ID 200U // Definition eines ungueltige Identifiers. -#define RC_NO_ID (sal_uInt32(0xFFFFFFFF)) +#define RC_NO_ID (sal_uInt32(0xFFFFFFFF)) // Dies sind die Resourcetypen // Mindestens 0x100 wegen MS-Windows Resourcetypen -//#define RSC_NOTYPE 0x100 +//#define RSC_NOTYPE 0x100 //RSC_NOTYPE wird in resid.hxx definiert -#define RSC_BYNAME (RSC_NOTYPE + 0x01) -#define RSC_VERSIONCONTROL (RSC_NOTYPE + 0x02) // Versionskontrolle +#define RSC_BYNAME (RSC_NOTYPE + 0x01) +#define RSC_VERSIONCONTROL (RSC_NOTYPE + 0x02) // Versionskontrolle -#define RSC_RESOURCE (RSC_NOTYPE + 0x10) -#define RSC_STRING (RSC_NOTYPE + 0x11) -#define RSC_BITMAP (RSC_NOTYPE + 0x13) -#define RSC_ACCEL (RSC_NOTYPE + 0x1a) -#define RSC_ACCELITEM (RSC_NOTYPE + 0x1b)// nur intern -#define RSC_MENU (RSC_NOTYPE + 0x1c) -#define RSC_MENUITEM (RSC_NOTYPE + 0x1d)// nur intern -#define RSC_KEYCODE (RSC_NOTYPE + 0x1f) -#define RSC_TIME (RSC_NOTYPE + 0x20) -#define RSC_DATE (RSC_NOTYPE + 0x21) -//#define RSC_INTERNATIONAL (RSC_NOTYPE + 0x22) // erAck: got rid of class International (2005-06-17) -#define RSC_IMAGE (RSC_NOTYPE + 0x23) -#define RSC_IMAGELIST (RSC_NOTYPE + 0x24) +#define RSC_RESOURCE (RSC_NOTYPE + 0x10) +#define RSC_STRING (RSC_NOTYPE + 0x11) +#define RSC_BITMAP (RSC_NOTYPE + 0x13) +#define RSC_ACCEL (RSC_NOTYPE + 0x1a) +#define RSC_ACCELITEM (RSC_NOTYPE + 0x1b)// nur intern +#define RSC_MENU (RSC_NOTYPE + 0x1c) +#define RSC_MENUITEM (RSC_NOTYPE + 0x1d)// nur intern +#define RSC_KEYCODE (RSC_NOTYPE + 0x1f) +#define RSC_TIME (RSC_NOTYPE + 0x20) +#define RSC_DATE (RSC_NOTYPE + 0x21) +//#define RSC_INTERNATIONAL (RSC_NOTYPE + 0x22) // erAck: got rid of class International (2005-06-17) +#define RSC_IMAGE (RSC_NOTYPE + 0x23) +#define RSC_IMAGELIST (RSC_NOTYPE + 0x24) -#define RSC_MESSBOX (RSC_NOTYPE + 0x30) -#define RSC_INFOBOX (RSC_NOTYPE + 0x31) -#define RSC_WARNINGBOX (RSC_NOTYPE + 0x32) -#define RSC_ERRORBOX (RSC_NOTYPE + 0x33) -#define RSC_QUERYBOX (RSC_NOTYPE + 0x34) -#define RSC_WINDOW (RSC_NOTYPE + 0x35) -#define RSC_SYSWINDOW (RSC_NOTYPE + 0x36) -#define RSC_WORKWIN (RSC_NOTYPE + 0x37) -#define RSC_MDIWINDOW (RSC_NOTYPE + 0x38) -#define RSC_FLOATINGWINDOW (RSC_NOTYPE + 0x39) -#define RSC_DIALOG (RSC_NOTYPE + 0x3a) -#define RSC_MODELESSDIALOG (RSC_NOTYPE + 0x3b) -#define RSC_MODALDIALOG (RSC_NOTYPE + 0x3c) -#define RSC_CONTROL (RSC_NOTYPE + 0x44) -#define RSC_BUTTON (RSC_NOTYPE + 0x45) -#define RSC_PUSHBUTTON (RSC_NOTYPE + 0x46) -#define RSC_OKBUTTON (RSC_NOTYPE + 0x47) -#define RSC_CANCELBUTTON (RSC_NOTYPE + 0x48) -#define RSC_HELPBUTTON (RSC_NOTYPE + 0x49) -#define RSC_IMAGEBUTTON (RSC_NOTYPE + 0x4a) -#define RSC_MENUBUTTON (RSC_NOTYPE + 0x4b) -#define RSC_MOREBUTTON (RSC_NOTYPE + 0x4c) -#define RSC_SPINBUTTON (RSC_NOTYPE + 0x4d) -#define RSC_RADIOBUTTON (RSC_NOTYPE + 0x4e) -#define RSC_IMAGERADIOBUTTON (RSC_NOTYPE + 0x4f) -#define RSC_CHECKBOX (RSC_NOTYPE + 0x50) -#define RSC_TRISTATEBOX (RSC_NOTYPE + 0x51) -#define RSC_EDIT (RSC_NOTYPE + 0x52) -#define RSC_MULTILINEEDIT (RSC_NOTYPE + 0x53) -#define RSC_COMBOBOX (RSC_NOTYPE + 0x54) -#define RSC_LISTBOX (RSC_NOTYPE + 0x55) -#define RSC_MULTILISTBOX (RSC_NOTYPE + 0x56) -#define RSC_TEXT (RSC_NOTYPE + 0x57) -#define RSC_FIXEDLINE (RSC_NOTYPE + 0x58) -#define RSC_FIXEDBITMAP (RSC_NOTYPE + 0x59) -#define RSC_FIXEDIMAGE (RSC_NOTYPE + 0x5a) -#define RSC_GROUPBOX (RSC_NOTYPE + 0x5c) -#define RSC_SCROLLBAR (RSC_NOTYPE + 0x5d) -#define RSC_SCROLLBARBOX (RSC_NOTYPE + 0x5e) -#define RSC_SPLITTER (RSC_NOTYPE + 0x5f) -#define RSC_SPLITWINDOW (RSC_NOTYPE + 0x60) -#define RSC_SPINFIELD (RSC_NOTYPE + 0x61) -#define RSC_PATTERNFIELD (RSC_NOTYPE + 0x62) -#define RSC_NUMERICFIELD (RSC_NOTYPE + 0x63) -#define RSC_METRICFIELD (RSC_NOTYPE + 0x64) -#define RSC_CURRENCYFIELD (RSC_NOTYPE + 0x65) -#define RSC_DATEFIELD (RSC_NOTYPE + 0x66) -#define RSC_TIMEFIELD (RSC_NOTYPE + 0x67) -#define RSC_PATTERNBOX (RSC_NOTYPE + 0x68) -#define RSC_NUMERICBOX (RSC_NOTYPE + 0x69) -#define RSC_METRICBOX (RSC_NOTYPE + 0x6a) -#define RSC_CURRENCYBOX (RSC_NOTYPE + 0x6b) -#define RSC_DATEBOX (RSC_NOTYPE + 0x6c) -#define RSC_TIMEBOX (RSC_NOTYPE + 0x6d) -#define RSC_LONGCURRENCYFIELD (RSC_NOTYPE + 0x6e) -#define RSC_LONGCURRENCYBOX (RSC_NOTYPE + 0x6f) -#define RSC_TOOLBOXITEM (RSC_NOTYPE + 0x70) -#define RSC_TOOLBOX (RSC_NOTYPE + 0x71) -#define RSC_DOCKINGWINDOW (RSC_NOTYPE + 0x72) -#define RSC_STATUSBAR (RSC_NOTYPE + 0x73) -#define RSC_TABPAGE (RSC_NOTYPE + 0x74) -#define RSC_TABCONTROL (RSC_NOTYPE + 0x75) -#define RSC_TABDIALOG (RSC_NOTYPE + 0x76) -#define RSC_TABCONTROLITEM (RSC_NOTYPE + 0x77) -#define RSC_TREELISTBOX (RSC_NOTYPE + 0x78) -#define RSC_STRINGARRAY (RSC_NOTYPE + 0x79) +#define RSC_MESSBOX (RSC_NOTYPE + 0x30) +#define RSC_INFOBOX (RSC_NOTYPE + 0x31) +#define RSC_WARNINGBOX (RSC_NOTYPE + 0x32) +#define RSC_ERRORBOX (RSC_NOTYPE + 0x33) +#define RSC_QUERYBOX (RSC_NOTYPE + 0x34) +#define RSC_WINDOW (RSC_NOTYPE + 0x35) +#define RSC_SYSWINDOW (RSC_NOTYPE + 0x36) +#define RSC_WORKWIN (RSC_NOTYPE + 0x37) +#define RSC_MDIWINDOW (RSC_NOTYPE + 0x38) +#define RSC_FLOATINGWINDOW (RSC_NOTYPE + 0x39) +#define RSC_DIALOG (RSC_NOTYPE + 0x3a) +#define RSC_MODELESSDIALOG (RSC_NOTYPE + 0x3b) +#define RSC_MODALDIALOG (RSC_NOTYPE + 0x3c) +#define RSC_CONTROL (RSC_NOTYPE + 0x44) +#define RSC_BUTTON (RSC_NOTYPE + 0x45) +#define RSC_PUSHBUTTON (RSC_NOTYPE + 0x46) +#define RSC_OKBUTTON (RSC_NOTYPE + 0x47) +#define RSC_CANCELBUTTON (RSC_NOTYPE + 0x48) +#define RSC_HELPBUTTON (RSC_NOTYPE + 0x49) +#define RSC_IMAGEBUTTON (RSC_NOTYPE + 0x4a) +#define RSC_MENUBUTTON (RSC_NOTYPE + 0x4b) +#define RSC_MOREBUTTON (RSC_NOTYPE + 0x4c) +#define RSC_SPINBUTTON (RSC_NOTYPE + 0x4d) +#define RSC_RADIOBUTTON (RSC_NOTYPE + 0x4e) +#define RSC_IMAGERADIOBUTTON (RSC_NOTYPE + 0x4f) +#define RSC_CHECKBOX (RSC_NOTYPE + 0x50) +#define RSC_TRISTATEBOX (RSC_NOTYPE + 0x51) +#define RSC_EDIT (RSC_NOTYPE + 0x52) +#define RSC_MULTILINEEDIT (RSC_NOTYPE + 0x53) +#define RSC_COMBOBOX (RSC_NOTYPE + 0x54) +#define RSC_LISTBOX (RSC_NOTYPE + 0x55) +#define RSC_MULTILISTBOX (RSC_NOTYPE + 0x56) +#define RSC_TEXT (RSC_NOTYPE + 0x57) +#define RSC_FIXEDLINE (RSC_NOTYPE + 0x58) +#define RSC_FIXEDBITMAP (RSC_NOTYPE + 0x59) +#define RSC_FIXEDIMAGE (RSC_NOTYPE + 0x5a) +#define RSC_GROUPBOX (RSC_NOTYPE + 0x5c) +#define RSC_SCROLLBAR (RSC_NOTYPE + 0x5d) +#define RSC_SCROLLBARBOX (RSC_NOTYPE + 0x5e) +#define RSC_SPLITTER (RSC_NOTYPE + 0x5f) +#define RSC_SPLITWINDOW (RSC_NOTYPE + 0x60) +#define RSC_SPINFIELD (RSC_NOTYPE + 0x61) +#define RSC_PATTERNFIELD (RSC_NOTYPE + 0x62) +#define RSC_NUMERICFIELD (RSC_NOTYPE + 0x63) +#define RSC_METRICFIELD (RSC_NOTYPE + 0x64) +#define RSC_CURRENCYFIELD (RSC_NOTYPE + 0x65) +#define RSC_DATEFIELD (RSC_NOTYPE + 0x66) +#define RSC_TIMEFIELD (RSC_NOTYPE + 0x67) +#define RSC_PATTERNBOX (RSC_NOTYPE + 0x68) +#define RSC_NUMERICBOX (RSC_NOTYPE + 0x69) +#define RSC_METRICBOX (RSC_NOTYPE + 0x6a) +#define RSC_CURRENCYBOX (RSC_NOTYPE + 0x6b) +#define RSC_DATEBOX (RSC_NOTYPE + 0x6c) +#define RSC_TIMEBOX (RSC_NOTYPE + 0x6d) +#define RSC_LONGCURRENCYFIELD (RSC_NOTYPE + 0x6e) +#define RSC_LONGCURRENCYBOX (RSC_NOTYPE + 0x6f) +#define RSC_TOOLBOXITEM (RSC_NOTYPE + 0x70) +#define RSC_TOOLBOX (RSC_NOTYPE + 0x71) +#define RSC_DOCKINGWINDOW (RSC_NOTYPE + 0x72) +#define RSC_STATUSBAR (RSC_NOTYPE + 0x73) +#define RSC_TABPAGE (RSC_NOTYPE + 0x74) +#define RSC_TABCONTROL (RSC_NOTYPE + 0x75) +#define RSC_TABDIALOG (RSC_NOTYPE + 0x76) +#define RSC_TABCONTROLITEM (RSC_NOTYPE + 0x77) +#define RSC_TREELISTBOX (RSC_NOTYPE + 0x78) +#define RSC_STRINGARRAY (RSC_NOTYPE + 0x79) // (RSC_NOTYPE + 0x200) - (RSC_NOTYPE + 0x300) fuer Sfx reserviert -#define RT_SYS_BITMAP (RSC_NOTYPE + 0xf2) -#define RT_SYS_STRING (RSC_NOTYPE + 0xf3) // Sonderbehandlung -#define RT_SYS_FILE (RSC_NOTYPE + 0xf4) // nicht implementiert +#define RT_SYS_BITMAP (RSC_NOTYPE + 0xf2) +#define RT_SYS_STRING (RSC_NOTYPE + 0xf3) // Sonderbehandlung +#define RT_SYS_FILE (RSC_NOTYPE + 0xf4) // nicht implementiert // (RSC_NOTYPE + 0x200) - (RSC_NOTYPE + 0x300) fuer Sfx reserviert diff --git a/tools/inc/tools/ref.hxx b/tools/inc/tools/ref.hxx index f5e4e753f02c..ea1886b73e04 100644 --- a/tools/inc/tools/ref.hxx +++ b/tools/inc/tools/ref.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,89 +33,89 @@ //========================================================================= -#define PRV_SV_DECL_REF_SIGNATURE( ClassName, Ref ) \ - inline ClassName##Ref() { pObj = 0; } \ - inline ClassName##Ref( const ClassName##Ref & rObj ); \ - inline ClassName##Ref( ClassName * pObjP ); \ - inline void Clear(); \ - inline ~ClassName##Ref(); \ - inline ClassName##Ref & operator = ( const ClassName##Ref & rObj ); \ - inline ClassName##Ref & operator = ( ClassName * pObj ); \ - inline BOOL Is() const { return pObj != NULL; } \ - inline ClassName * operator & () const { return pObj; } \ - inline ClassName * operator -> () const { return pObj; } \ - inline ClassName & operator * () const { return *pObj; } \ +#define PRV_SV_DECL_REF_SIGNATURE( ClassName, Ref ) \ + inline ClassName##Ref() { pObj = 0; } \ + inline ClassName##Ref( const ClassName##Ref & rObj ); \ + inline ClassName##Ref( ClassName * pObjP ); \ + inline void Clear(); \ + inline ~ClassName##Ref(); \ + inline ClassName##Ref & operator = ( const ClassName##Ref & rObj ); \ + inline ClassName##Ref & operator = ( ClassName * pObj ); \ + inline BOOL Is() const { return pObj != NULL; } \ + inline ClassName * operator & () const { return pObj; } \ + inline ClassName * operator -> () const { return pObj; } \ + inline ClassName & operator * () const { return *pObj; } \ inline operator ClassName * () const { return pObj; } #define PRV_SV_IMPL_REF_COUNTERS( ClassName, Ref, AddRef, AddNextRef, ReleaseRef, Init, pRefbase ) \ -inline ClassName##Ref::ClassName##Ref( const ClassName##Ref & rObj ) \ - { pObj = rObj.pObj; if( pObj ) { Init pRefbase->AddNextRef; } } \ -inline ClassName##Ref::ClassName##Ref( ClassName * pObjP ) \ -{ pObj = pObjP; if( pObj ) { Init pRefbase->AddRef; } } \ -inline void ClassName##Ref::Clear() \ -{ \ - if( pObj ) \ - { \ - ClassName* const pRefObj = pRefbase; \ - pObj = 0; \ - pRefObj->ReleaseRef; \ - } \ -} \ -inline ClassName##Ref::~ClassName##Ref() \ -{ if( pObj ) { pRefbase->ReleaseRef; } } \ -inline ClassName##Ref & ClassName##Ref:: \ - operator = ( const ClassName##Ref & rObj ) \ -{ \ - if( rObj.pObj ) rObj.pRefbase->AddNextRef; \ - ClassName* const pRefObj = pRefbase; \ - pObj = rObj.pObj; \ - Init if( pRefObj ) { pRefObj->ReleaseRef; } \ - return *this; \ -} \ -inline ClassName##Ref & ClassName##Ref::operator = ( ClassName * pObjP ) \ +inline ClassName##Ref::ClassName##Ref( const ClassName##Ref & rObj ) \ + { pObj = rObj.pObj; if( pObj ) { Init pRefbase->AddNextRef; } } \ +inline ClassName##Ref::ClassName##Ref( ClassName * pObjP ) \ +{ pObj = pObjP; if( pObj ) { Init pRefbase->AddRef; } } \ +inline void ClassName##Ref::Clear() \ +{ \ + if( pObj ) \ + { \ + ClassName* const pRefObj = pRefbase; \ + pObj = 0; \ + pRefObj->ReleaseRef; \ + } \ +} \ +inline ClassName##Ref::~ClassName##Ref() \ +{ if( pObj ) { pRefbase->ReleaseRef; } } \ +inline ClassName##Ref & ClassName##Ref:: \ + operator = ( const ClassName##Ref & rObj ) \ +{ \ + if( rObj.pObj ) rObj.pRefbase->AddNextRef; \ + ClassName* const pRefObj = pRefbase; \ + pObj = rObj.pObj; \ + Init if( pRefObj ) { pRefObj->ReleaseRef; } \ + return *this; \ +} \ +inline ClassName##Ref & ClassName##Ref::operator = ( ClassName * pObjP ) \ { return *this = ClassName##Ref( pObjP ); } -#define PRV_SV_DECL_REF_LOCK(ClassName, Ref) \ -protected: \ - ClassName * pObj; \ -public: \ +#define PRV_SV_DECL_REF_LOCK(ClassName, Ref) \ +protected: \ + ClassName * pObj; \ +public: \ PRV_SV_DECL_REF_SIGNATURE(ClassName, Ref) -#define PRV_SV_DECL_REF( ClassName ) \ +#define PRV_SV_DECL_REF( ClassName ) \ PRV_SV_DECL_REF_LOCK( ClassName, Ref ) -#define PRV_SV_DECL_LOCK( ClassName ) \ +#define PRV_SV_DECL_LOCK( ClassName ) \ PRV_SV_DECL_REF_LOCK( ClassName, Lock ) -#define SV_DECL_REF( ClassName ) \ -class ClassName; \ -class ClassName##Ref \ -{ \ - PRV_SV_DECL_REF( ClassName ) \ +#define SV_DECL_REF( ClassName ) \ +class ClassName; \ +class ClassName##Ref \ +{ \ + PRV_SV_DECL_REF( ClassName ) \ }; -#define SV_DECL_LOCK( ClassName ) \ -class ClassName; \ -class ClassName##Lock \ -{ \ - PRV_SV_DECL_LOCK( ClassName ) \ +#define SV_DECL_LOCK( ClassName ) \ +class ClassName; \ +class ClassName##Lock \ +{ \ + PRV_SV_DECL_LOCK( ClassName ) \ }; -#define SV_IMPL_REF( ClassName ) \ +#define SV_IMPL_REF( ClassName ) \ PRV_SV_IMPL_REF_COUNTERS( ClassName, Ref, AddRef(), AddNextRef(),\ ReleaseReference(), EMPTYARG, pObj ) -#define SV_IMPL_LOCK( ClassName ) \ -PRV_SV_IMPL_REF_COUNTERS( ClassName, Lock, OwnerLock( TRUE ), \ - OwnerLock( TRUE ), OwnerLock( FALSE ), \ +#define SV_IMPL_LOCK( ClassName ) \ +PRV_SV_IMPL_REF_COUNTERS( ClassName, Lock, OwnerLock( TRUE ), \ + OwnerLock( TRUE ), OwnerLock( FALSE ), \ EMPTYARG, pObj ) -#define SV_DECL_IMPL_REF(ClassName) \ - SV_DECL_REF(ClassName) \ +#define SV_DECL_IMPL_REF(ClassName) \ + SV_DECL_REF(ClassName) \ SV_IMPL_REF(ClassName) -#define SV_DECL_IMPL_LOCK( ClassName ) \ - SV_DECL_LOCK(ClassName) \ +#define SV_DECL_IMPL_LOCK( ClassName ) \ + SV_DECL_LOCK(ClassName) \ SV_IMPL_LOCK(ClassName) @@ -300,9 +300,9 @@ inline EntryName ClassName##MemberList::Prev()\ {return (EntryName)BaseList::Prev();}\ inline void ClassName##MemberList::Append( const ClassName##MemberList & rList )\ {BaseList::Append(rList);}\ -inline ULONG ClassName##MemberList::GetPos( const EntryName p) const\ +inline ULONG ClassName##MemberList::GetPos( const EntryName p) const\ {return BaseList::GetPos( p );}\ -inline ULONG ClassName##MemberList::GetPos\ +inline ULONG ClassName##MemberList::GetPos\ ( const EntryName p, ULONG nStart, BOOL bForward ) const\ {return BaseList::GetPos( p, nStart, bForward );} @@ -327,9 +327,9 @@ class TOOLS_DLLPUBLIC SvRefBase UINT32 nRefCount; #if defined (GCC) && (defined (C281) || defined (C290) || defined (C291)) public: -#else +#else protected: -#endif +#endif virtual ~SvRefBase(); virtual void QueryDelete(); public: @@ -351,7 +351,7 @@ public: nRefCount -= SV_NO_DELETE_REFCOUNT; return ++nRefCount; } - void ReleaseReference() + void ReleaseReference() { if( !--nRefCount ) QueryDelete(); @@ -425,27 +425,27 @@ public: ~SvCompatWeakBase() { _xHdl->ResetWeakBase(); } }; -#define SV_DECL_WEAK_IMPL( ClassName, HdlName ) \ -class ClassName##Weak \ -{ \ - HdlName _xHdl; \ -public: \ - inline ClassName##Weak( ) {} \ - inline ClassName##Weak( ClassName* pObj ) { \ - if( pObj ) _xHdl = pObj->GetHdl(); } \ - inline void Clear() { _xHdl.Clear(); } \ - inline ClassName##Weak& operator = ( ClassName * pObj ) { \ - _xHdl = pObj ? pObj->GetHdl() : 0; return *this; } \ - inline BOOL Is() const { \ - return _xHdl.Is() && _xHdl->GetObj(); } \ - inline ClassName * operator & () const { \ - return (ClassName*) ( _xHdl.Is() ? _xHdl->GetObj() : 0 ); } \ - inline ClassName * operator -> () const { \ - return (ClassName*) ( _xHdl.Is() ? _xHdl->GetObj() : 0 ); } \ - inline ClassName & operator * () const { \ - return *(ClassName*) _xHdl->GetObj(); } \ - inline operator ClassName * () const { \ - return (ClassName*) (_xHdl.Is() ? _xHdl->GetObj() : 0 ); } \ +#define SV_DECL_WEAK_IMPL( ClassName, HdlName ) \ +class ClassName##Weak \ +{ \ + HdlName _xHdl; \ +public: \ + inline ClassName##Weak( ) {} \ + inline ClassName##Weak( ClassName* pObj ) { \ + if( pObj ) _xHdl = pObj->GetHdl(); } \ + inline void Clear() { _xHdl.Clear(); } \ + inline ClassName##Weak& operator = ( ClassName * pObj ) { \ + _xHdl = pObj ? pObj->GetHdl() : 0; return *this; } \ + inline BOOL Is() const { \ + return _xHdl.Is() && _xHdl->GetObj(); } \ + inline ClassName * operator & () const { \ + return (ClassName*) ( _xHdl.Is() ? _xHdl->GetObj() : 0 ); } \ + inline ClassName * operator -> () const { \ + return (ClassName*) ( _xHdl.Is() ? _xHdl->GetObj() : 0 ); } \ + inline ClassName & operator * () const { \ + return *(ClassName*) _xHdl->GetObj(); } \ + inline operator ClassName * () const { \ + return (ClassName*) (_xHdl.Is() ? _xHdl->GetObj() : 0 ); } \ }; #define SV_DECL_WEAK( ClassName ) SV_DECL_WEAK_IMPL( ClassName, SvWeakHdlRef ) diff --git a/tools/inc/tools/resary.hxx b/tools/inc/tools/resary.hxx index 97c8606fa840..b6cd8f8943c6 100644 --- a/tools/inc/tools/resary.hxx +++ b/tools/inc/tools/resary.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,8 +37,8 @@ struct ImplResStringItem { - XubString maStr; - long mnValue; + XubString maStr; + long mnValue; //#if 0 // _SOLAR__PRIVATE #ifdef _TOOLS_RESARY_CXX @@ -62,32 +62,32 @@ class TOOLS_DLLPUBLIC ResStringArray // --------------------- struct ImplResStringItem { - XubString m_aStr; - long m_nValue; - + XubString m_aStr; + long m_nValue; + ImplResStringItem( const XubString& rStr, long nValue = 0 ) : m_aStr( rStr ), m_nValue( nValue ) {} }; - + std::vector< ImplResStringItem > m_aStrings; - + public: ResStringArray( const ResId& rResId ); ~ResStringArray(); - - const XubString& GetString( sal_uInt32 nIndex ) const + + const XubString& GetString( sal_uInt32 nIndex ) const { return (nIndex < m_aStrings.size()) ? m_aStrings[nIndex].m_aStr : String::EmptyString(); } - long GetValue( sal_uInt32 nIndex ) const + long GetValue( sal_uInt32 nIndex ) const { return (nIndex < m_aStrings.size()) ? m_aStrings[nIndex].m_nValue : -1; } - sal_uInt32 Count() const { return sal_uInt32(m_aStrings.size()); } - - sal_uInt32 FindIndex( long nValue ) const; - + sal_uInt32 Count() const { return sal_uInt32(m_aStrings.size()); } + + sal_uInt32 FindIndex( long nValue ) const; + private: ResStringArray( const ResStringArray& ); - ResStringArray& operator=( const ResStringArray& ); + ResStringArray& operator=( const ResStringArray& ); }; -#endif // _TOOLS_RESARY_HXX +#endif // _TOOLS_RESARY_HXX diff --git a/tools/inc/tools/resid.hxx b/tools/inc/tools/resid.hxx index 2f7552cba063..cfefce8e6ab0 100644 --- a/tools/inc/tools/resid.hxx +++ b/tools/inc/tools/resid.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,8 +33,8 @@ struct RSHEADER_TYPE; typedef sal_uInt32 RESOURCE_TYPE; -#define RSC_NOTYPE 0x100 -#define RSC_DONTRELEASE (sal_uInt32(1 << 31)) +#define RSC_NOTYPE 0x100 +#define RSC_DONTRELEASE (sal_uInt32(1 << 31)) class ResMgr; @@ -52,14 +52,14 @@ class ResId In this case the highest bit if set decides whether to not to release the Resource context after loading this id */ - RSHEADER_TYPE* m_pResource; - - mutable sal_uInt32 m_nResId; // Resource Identifier - mutable RESOURCE_TYPE m_nRT; // type for loading (mutable to be set later) - mutable ResMgr * m_pResMgr; // load from this ResMgr (mutable for setting on demand) - mutable RESOURCE_TYPE m_nRT2; // type for loading (supercedes m_nRT) + RSHEADER_TYPE* m_pResource; + + mutable sal_uInt32 m_nResId; // Resource Identifier + mutable RESOURCE_TYPE m_nRT; // type for loading (mutable to be set later) + mutable ResMgr * m_pResMgr; // load from this ResMgr (mutable for setting on demand) + mutable RESOURCE_TYPE m_nRT2; // type for loading (supercedes m_nRT) mutable sal_uInt32 m_nWinBits; // container for original style bits on a window in a resource - + void ImplInit( sal_uInt32 nId, ResMgr& rMgr, RSHEADER_TYPE* pRes ) { m_pResource = pRes; m_nResId = nId; m_nRT = RSC_NOTYPE; m_pResMgr = &rMgr; m_nRT2 = RSC_NOTYPE; m_nWinBits = 0; @@ -87,24 +87,24 @@ class ResId { ImplInit( sal_uInt32(nId), rMgr, NULL ); } - + sal_uInt32 GetWinBits() const { return m_nWinBits; } void SetWinBits( sal_uInt32 nBits ) const { m_nWinBits = nBits; } - - RESOURCE_TYPE GetRT() const { return( m_nRT ); } - const ResId & SetRT( RESOURCE_TYPE nType ) const + + RESOURCE_TYPE GetRT() const { return( m_nRT ); } + const ResId & SetRT( RESOURCE_TYPE nType ) const /* Set the type if not already set. Ask for tye with GetRT() - + [Example] ResId aId( 1000 ); - aId.SetRT( RSC_WINDOW ); // settype window Window - aId.SetRT( RSC_BUTTON ); // will not set type Button + aId.SetRT( RSC_WINDOW ); // settype window Window + aId.SetRT( RSC_BUTTON ); // will not set type Button //aId.GetRT() == RSC_WINDOW is true - - @see + + @see ResId::GetRT2(), ResId::GetRT() */ { @@ -112,7 +112,7 @@ class ResId m_nRT = nType; return *this; } - RESOURCE_TYPE GetRT2() const + RESOURCE_TYPE GetRT2() const /* Get the effective type (m_nRT2 or m_nRT1) @@ -122,10 +122,10 @@ class ResId { return (RSC_NOTYPE == m_nRT2) ? m_nRT : m_nRT2; } - const ResId & SetRT2( RESOURCE_TYPE nTyp ) const + const ResId & SetRT2( RESOURCE_TYPE nTyp ) const /* Set the superceding type. Ask spcifically for it with GetRT2() - + SetRT2() may only be called if no derived class calls SetRT in its Resource constructor. */ @@ -134,15 +134,15 @@ class ResId m_nRT2 = nTyp; return *this; } - - ResMgr * GetResMgr() const { return m_pResMgr; } - const ResId & SetResMgr( ResMgr * pMgr ) const + + ResMgr * GetResMgr() const { return m_pResMgr; } + const ResId & SetResMgr( ResMgr * pMgr ) const { m_pResMgr = pMgr; OSL_ENSURE( m_pResMgr != NULL, "invalid ResMgr set on ResId" ); return *this; } - + const ResId & SetAutoRelease(BOOL bRelease) const { if( bRelease ) @@ -151,12 +151,12 @@ class ResId m_nResId |= RSC_DONTRELEASE; return *this; } - - BOOL IsAutoRelease() const + + BOOL IsAutoRelease() const { return !(m_nResId & RSC_DONTRELEASE); } - - sal_uInt32 GetId() const { return m_nResId & ~RSC_DONTRELEASE; } - RSHEADER_TYPE* GetpResource() const { return m_pResource; } + + sal_uInt32 GetId() const { return m_nResId & ~RSC_DONTRELEASE; } + RSHEADER_TYPE* GetpResource() const { return m_pResource; } }; #endif // _RESID_HXX diff --git a/tools/inc/tools/resmgr.hxx b/tools/inc/tools/resmgr.hxx index 87f3fb6cbd30..b19524139078 100644 --- a/tools/inc/tools/resmgr.hxx +++ b/tools/inc/tools/resmgr.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,14 +52,14 @@ class InternalResMgr; struct RSHEADER_TYPE { private: - sal_uInt32 nId; // Identifier der Resource - RESOURCE_TYPE nRT; // Resource Typ - sal_uInt32 nGlobOff; // Globaler Offset - sal_uInt32 nLocalOff; // Lokaler Offset + sal_uInt32 nId; // Identifier der Resource + RESOURCE_TYPE nRT; // Resource Typ + sal_uInt32 nGlobOff; // Globaler Offset + sal_uInt32 nLocalOff; // Lokaler Offset public: - inline sal_uInt32 GetId(); // Identifier der Resource - inline RESOURCE_TYPE GetRT(); // Resource Typ + inline sal_uInt32 GetId(); // Identifier der Resource + inline RESOURCE_TYPE GetRT(); // Resource Typ inline sal_uInt32 GetGlobOff(); // Globaler Offset inline sal_uInt32 GetLocalOff(); // Lokaler Offset }; @@ -75,10 +75,10 @@ typedef void (*ResHookProc)( UniString& rStr ); // ---------- // Initialisierung -#define RC_NOTYPE 0x00 +#define RC_NOTYPE 0x00 // Globale Resource -#define RC_GLOBAL 0x01 -#define RC_AUTORELEASE 0x02 +#define RC_GLOBAL 0x01 +#define RC_AUTORELEASE 0x02 #define RC_NOTFOUND 0x04 #define RC_FALLBACK_DOWN 0x08 #define RC_FALLBACK_UP 0x10 @@ -88,23 +88,23 @@ class ResMgr; struct ImpRCStack { // pResource and pClassRes equal NULL: resource was not loaded - RSHEADER_TYPE * pResource; // pointer to resource - void * pClassRes; // pointer to class specified init data - short Flags; // resource status - void * aResHandle; // Resource-Identifier from InternalResMgr - const Resource* pResObj; // pointer to Resource object - sal_uInt32 nId; // ResId used for error message - ResMgr* pResMgr; // ResMgr for Resource pResObj - - void Clear(); - void Init( ResMgr * pMgr, const Resource * pObj, sal_uInt32 nId ); + RSHEADER_TYPE * pResource; // pointer to resource + void * pClassRes; // pointer to class specified init data + short Flags; // resource status + void * aResHandle; // Resource-Identifier from InternalResMgr + const Resource* pResObj; // pointer to Resource object + sal_uInt32 nId; // ResId used for error message + ResMgr* pResMgr; // ResMgr for Resource pResObj + + void Clear(); + void Init( ResMgr * pMgr, const Resource * pObj, sal_uInt32 nId ); }; class TOOLS_DLLPUBLIC ResMgr { private: InternalResMgr* pImpRes; - std::vector< ImpRCStack > aStack; // resource context stack + std::vector< ImpRCStack > aStack; // resource context stack int nCurStack; ResMgr* pFallbackResMgr; // fallback ResMgr in case the Resource // was not contained in this ResMgr @@ -114,11 +114,11 @@ private: TOOLS_DLLPRIVATE void incStack(); TOOLS_DLLPRIVATE void decStack(); - TOOLS_DLLPRIVATE const ImpRCStack * StackTop( sal_uInt32 nOff = 0 ) const + TOOLS_DLLPRIVATE const ImpRCStack * StackTop( sal_uInt32 nOff = 0 ) const { return (((int)nOff >= nCurStack) ? NULL : &aStack[nCurStack-nOff]); } - TOOLS_DLLPRIVATE void Init( const rtl::OUString& rFileName ); + TOOLS_DLLPRIVATE void Init( const rtl::OUString& rFileName ); TOOLS_DLLPRIVATE ResMgr( InternalResMgr * pImp ); @@ -138,9 +138,9 @@ private: // the next two methods are needed to prevent the string hook called // with the res mgr mutex locked // like GetString, but doesn't call the string hook - TOOLS_DLLPRIVATE static sal_uInt32 GetStringWithoutHook( UniString& rStr, const BYTE* pStr ); + TOOLS_DLLPRIVATE static sal_uInt32 GetStringWithoutHook( UniString& rStr, const BYTE* pStr ); // like ReadString but doesn't call the string hook - TOOLS_DLLPRIVATE UniString ReadStringWithoutHook(); + TOOLS_DLLPRIVATE UniString ReadStringWithoutHook(); static ResMgr* ImplCreateResMgr( InternalResMgr* pImpl ) { return new ResMgr( pImpl ); } @@ -148,73 +148,73 @@ private: ResMgr(const ResMgr&); ResMgr& operator=(const ResMgr&); public: - static void DestroyAllResMgr(); // Wird gerufen, wenn App beendet wird + static void DestroyAllResMgr(); // Wird gerufen, wenn App beendet wird ~ResMgr(); // Sprachabhaengige Ressource Library - static const sal_Char* GetLang( LanguageType& eLanguage, USHORT nPrio = 0 ); //depricated! see "tools/source/rc/resmgr.cxx" + static const sal_Char* GetLang( LanguageType& eLanguage, USHORT nPrio = 0 ); //depricated! see "tools/source/rc/resmgr.cxx" static ResMgr* SearchCreateResMgr( const sal_Char* pPrefixName, com::sun::star::lang::Locale& rLocale ); - static ResMgr* CreateResMgr( const sal_Char* pPrefixName, + static ResMgr* CreateResMgr( const sal_Char* pPrefixName, com::sun::star::lang::Locale aLocale = com::sun::star::lang::Locale( rtl::OUString(), rtl::OUString(), rtl::OUString())); // Testet ob Resource noch da ist - void TestStack( const Resource * ); + void TestStack( const Resource * ); // ist Resource verfuegbar - BOOL IsAvailable( const ResId& rId, + BOOL IsAvailable( const ResId& rId, const Resource* = NULL) const; // Resource suchen und laden - BOOL GetResource( const ResId& rId, const Resource * = NULL ); - static void * GetResourceSkipHeader( const ResId& rResId, ResMgr ** ppResMgr ); + BOOL GetResource( const ResId& rId, const Resource * = NULL ); + static void * GetResourceSkipHeader( const ResId& rResId, ResMgr ** ppResMgr ); // Kontext freigeben - void PopContext( const Resource* = NULL ); + void PopContext( const Resource* = NULL ); // Resourcezeiger erhoehen - void* Increment( sal_uInt32 nSize ); + void* Increment( sal_uInt32 nSize ); // Groesse ein Objektes in der Resource - static sal_uInt32 GetObjSize( RSHEADER_TYPE* pHT ) + static sal_uInt32 GetObjSize( RSHEADER_TYPE* pHT ) { return( pHT->GetGlobOff() ); } // Liefert einen String aus der Resource - static sal_uInt32 GetString( UniString& rStr, const BYTE* pStr ); + static sal_uInt32 GetString( UniString& rStr, const BYTE* pStr ); // Groesse eines Strings in der Resource - static sal_uInt32 GetStringSize( sal_uInt32 nLen ) + static sal_uInt32 GetStringSize( sal_uInt32 nLen ) { nLen++; return (nLen + nLen%2); } - static sal_uInt32 GetStringSize( const BYTE* pStr ); + static sal_uInt32 GetStringSize( const BYTE* pStr ); // return a int64 static sal_uInt64 GetUInt64( void* pDatum ); // Gibt einen long zurueck - static INT32 GetLong( void * pLong ); + static INT32 GetLong( void * pLong ); // return a short - static INT16 GetShort( void * pShort ); + static INT16 GetShort( void * pShort ); // Gibt einen Zeiger auf die Resource zurueck - void * GetClass(); + void * GetClass(); - RSHEADER_TYPE * CreateBlock( const ResId & rId ); + RSHEADER_TYPE * CreateBlock( const ResId & rId ); // Gibt die verbleibende Groesse zurueck - sal_uInt32 GetRemainSize(); + sal_uInt32 GetRemainSize(); const rtl::OUString&GetFileName() const; - INT16 ReadShort(); - INT32 ReadLong(); - UniString ReadString(); + INT16 ReadShort(); + INT32 ReadLong(); + UniString ReadString(); // generate auto help id for current resource stack ULONG GetAutoHelpId(); - static void SetReadStringHook( ResHookProc pProc ); - static ResHookProc GetReadStringHook(); + static void SetReadStringHook( ResHookProc pProc ); + static ResHookProc GetReadStringHook(); static void SetDefaultLocale( const com::sun::star::lang::Locale& rLocale ); }; diff --git a/tools/inc/tools/rtti.hxx b/tools/inc/tools/rtti.hxx index 3cedb7f8cd2a..1f8673596b48 100644 --- a/tools/inc/tools/rtti.hxx +++ b/tools/inc/tools/rtti.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -120,7 +120,7 @@ typedef void* (*TypeId)(); // On-Demand-faehige persistent-TypeId Version #define TYPEINFO_ID(id) \ - static TypeId StaticType() { return (TypeId) ( id | 0xF000000L ); } \ + static TypeId StaticType() { return (TypeId) ( id | 0xF000000L ); } \ static BOOL IsOf( TypeId aSameOrSuperType ); \ virtual TypeId Type() const; \ virtual BOOL IsA( TypeId aSameOrSuperType ) const diff --git a/tools/inc/tools/shl.hxx b/tools/inc/tools/shl.hxx index 4a176e468bb7..ab08e3cc7a58 100644 --- a/tools/inc/tools/shl.hxx +++ b/tools/inc/tools/shl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,79 +35,79 @@ // - GetAppData() - // ---------------- -#define SHL_SHL1 0 -#define SHL_SHL2 1 -#define SHL_SHL3 2 -#define SHL_APP1 3 -#define SHL_APP2 4 -#define SHL_APP3 5 -#define SHL_TOOLS 6 -#define SHL_SV 7 -#define SHL_SVT 8 -#define SHL_SVDDE 9 -#define SHL_ERR 10 -#define SHL_IPC 11 -#define SHL_SVX 12 -#define SHL_ITEM 13 -#define SHL_SVD 14 -#define SHL_SI 15 -#define SHL_SFC 16 -#define SHL_SFX 17 -//#define SHL_SO2 18 -#define SHL_IDL 19 -#define SHL_IDE 20 -#define SHL_EDIT 21 -#define SHL_VCED 22 -#define SHL_BASIC 23 -#define SHL_HELP 24 -#define SHL_LNKCCH 25 -#define SHL_CHANNEL 26 -#define SHL_SBX 27 -#define SHL_SBC 28 -#define SHL_SDB 29 -#define SHL_SBA 30 -#define SHL_SBA2 31 -#define SHL_SCH 32 -#define SHL_SIM 33 -#define SHL_SM 34 -#define SHL_SGA 35 -#define SHL_DOCMGR 36 +#define SHL_SHL1 0 +#define SHL_SHL2 1 +#define SHL_SHL3 2 +#define SHL_APP1 3 +#define SHL_APP2 4 +#define SHL_APP3 5 +#define SHL_TOOLS 6 +#define SHL_SV 7 +#define SHL_SVT 8 +#define SHL_SVDDE 9 +#define SHL_ERR 10 +#define SHL_IPC 11 +#define SHL_SVX 12 +#define SHL_ITEM 13 +#define SHL_SVD 14 +#define SHL_SI 15 +#define SHL_SFC 16 +#define SHL_SFX 17 +//#define SHL_SO2 18 +#define SHL_IDL 19 +#define SHL_IDE 20 +#define SHL_EDIT 21 +#define SHL_VCED 22 +#define SHL_BASIC 23 +#define SHL_HELP 24 +#define SHL_LNKCCH 25 +#define SHL_CHANNEL 26 +#define SHL_SBX 27 +#define SHL_SBC 28 +#define SHL_SDB 29 +#define SHL_SBA 30 +#define SHL_SBA2 31 +#define SHL_SCH 32 +#define SHL_SIM 33 +#define SHL_SM 34 +#define SHL_SGA 35 +#define SHL_DOCMGR 36 // 37 removed -#define SHL_MAIL 38 -#define SHL_NEWS 39 -#define SHL_OFFAPP 40 -#define SHL_INET 41 -#define SHL_CHAOS 42 -#define SHL_HISTORY 43 -#define SHL_SJ 44 -#define SHL_CALC 45 -#define SHL_DRAW 46 -#define SHL_WRITER 47 -#define SHL_MONEY 48 -#define SHL_HBCI 49 -#define SHL_BASE3D 50 -#define SHL_BRUSHITEM 51 -#define SHL_SFONTITEM 52 +#define SHL_MAIL 38 +#define SHL_NEWS 39 +#define SHL_OFFAPP 40 +#define SHL_INET 41 +#define SHL_CHAOS 42 +#define SHL_HISTORY 43 +#define SHL_SJ 44 +#define SHL_CALC 45 +#define SHL_DRAW 46 +#define SHL_WRITER 47 +#define SHL_MONEY 48 +#define SHL_HBCI 49 +#define SHL_BASE3D 50 +#define SHL_BRUSHITEM 51 +#define SHL_SFONTITEM 52 // #110743# -// #define SHL_COUNT 53 +// #define SHL_COUNT 53 // the following added for binary filter project // Sice an array is created for that values, it is necessary to // put them directly behind the defined ones. Else, some space is // wasted. -#define BF_SHL_SVX 53 -#define BF_SHL_ITEM 54 -#define BF_SHL_SVD 55 -#define BF_SHL_EDIT 56 -#define BF_SHL_SCH 57 -#define BF_SHL_SM 58 -#define BF_SHL_CALC 59 -#define BF_SHL_DRAW 60 -#define BF_SHL_WRITER 61 -#define BF_SHL_SVT 62 -#define BF_SHL_SVDDE 63 +#define BF_SHL_SVX 53 +#define BF_SHL_ITEM 54 +#define BF_SHL_SVD 55 +#define BF_SHL_EDIT 56 +#define BF_SHL_SCH 57 +#define BF_SHL_SM 58 +#define BF_SHL_CALC 59 +#define BF_SHL_DRAW 60 +#define BF_SHL_WRITER 61 +#define BF_SHL_SVT 62 +#define BF_SHL_SVDDE 63 -#define SHL_COUNT 64 +#define SHL_COUNT 64 TOOLS_DLLPUBLIC void** GetAppData( USHORT nSharedLib ); diff --git a/tools/inc/tools/simplerm.hxx b/tools/inc/tools/simplerm.hxx index fe14979f1817..c16fe41abc0b 100644 --- a/tools/inc/tools/simplerm.hxx +++ b/tools/inc/tools/simplerm.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,8 +46,8 @@ class InternalResMgr; class TOOLS_DLLPUBLIC SimpleResMgr { protected: - NAMESPACE_VOS(OMutex) m_aAccessSafety; - InternalResMgr* m_pResImpl; + NAMESPACE_VOS(OMutex) m_aAccessSafety; + InternalResMgr* m_pResImpl; public: /** creates a new SimpleResManager @@ -61,7 +61,7 @@ public: const ::com::sun::star::lang::Locale& _rLocale); /** creates a new SimpleResManager - @param _rPrefixName + @param _rPrefixName denotes the prefix of the resource file name @param _inout_Locale denotes the locale of the resource file to load. If empty, no default handling @@ -73,9 +73,9 @@ public: this one will be loaded as final fallback. */ SimpleResMgr( const ::rtl::OUString& _rPrefixName, ::com::sun::star::lang::Locale& _inout_Locale ); - virtual ~SimpleResMgr(); + virtual ~SimpleResMgr(); - static SimpleResMgr* Create( const sal_Char* pPrefixName, + static SimpleResMgr* Create( const sal_Char* pPrefixName, ::com::sun::star::lang::Locale aLocale = ::com::sun::star::lang::Locale( rtl::OUString(), rtl::OUString(), rtl::OUString()));// nur in VCL @@ -97,7 +97,7 @@ public: an existent string @seealso IsAvailable */ - UniString ReadString( sal_uInt32 nId ); + UniString ReadString( sal_uInt32 nId ); /** checks whether a certain resource is availble @param _resourceType @@ -110,8 +110,8 @@ public: */ bool IsAvailable( RESOURCE_TYPE _resourceType, sal_uInt32 _resourceId ); - sal_uInt32 ReadBlob( sal_uInt32 nId, void** pBuffer ); - void FreeBlob( void* pBuffer ); + sal_uInt32 ReadBlob( sal_uInt32 nId, void** pBuffer ); + void FreeBlob( void* pBuffer ); }; #endif // _TOOLS_SIMPLERESMGR_HXX_ diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h index a6abdf03c6d2..096d34d05b9e 100644 --- a/tools/inc/tools/solar.h +++ b/tools/inc/tools/solar.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,17 +35,17 @@ /*** common solar defines ***********************************/ #ifndef TRUE -#define TRUE 1 +#define TRUE 1 #endif #ifndef FALSE -#define FALSE 0 +#define FALSE 0 #endif #ifdef _SOLAR__PRIVATE #undef _SOLAR__PRIVATE #endif #define _SOLAR__PRIVATE 1 -#define __REFERENCED 0 +#define __REFERENCED 0 /*** common solar types ********************************************/ /* NOTE: these types are deprecated, or soon will be. They should */ @@ -54,41 +54,41 @@ /* Previous typedefs from before sal convergence are in comments */ /* to the right of the new types. */ -typedef sal_Bool BOOL; /* typedef unsigned char BOOL; */ -typedef sal_uInt8 BYTE; /* typedef unsigned char BYTE; */ -typedef sal_uInt16 USHORT; /* typedef unsigned short USHORT; */ -typedef sal_uIntPtr ULONG; /* typedef unsigned long ULONG; */ -typedef int FASTBOOL; +typedef sal_Bool BOOL; /* typedef unsigned char BOOL; */ +typedef sal_uInt8 BYTE; /* typedef unsigned char BYTE; */ +typedef sal_uInt16 USHORT; /* typedef unsigned short USHORT; */ +typedef sal_uIntPtr ULONG; /* typedef unsigned long ULONG; */ +typedef int FASTBOOL; #if !defined(VCL_NEED_BASETSD) || defined(__MINGW32__) #ifndef _SOLAR_NOUINT -typedef sal_Int16 INT16; /* typedef short INT16; */ -typedef sal_uInt16 UINT16; /* typedef unsigned short UINT16; */ +typedef sal_Int16 INT16; /* typedef short INT16; */ +typedef sal_uInt16 UINT16; /* typedef unsigned short UINT16; */ #if defined(SAL_W32) -typedef sal_sChar INT8; +typedef sal_sChar INT8; #else -typedef sal_Char INT8; /* typedef char INT8; */ +typedef sal_Char INT8; /* typedef char INT8; */ #endif -typedef sal_uInt8 UINT8; /* typedef unsigned char UINT8; */ +typedef sal_uInt8 UINT8; /* typedef unsigned char UINT8; */ #endif /* _SOLAR_NOUINT */ #endif #ifndef VCL_NEED_BASETSD #ifndef _SOLAR_NOUINT /* types with exact defined size (not just the minimum size) */ -typedef sal_Int64 INT64; /* typedef long INT64; previously "void" on Windows */ -typedef sal_uInt64 UINT64; /* typedef unsigned long UINT64; previously "void" on Windows */ -typedef sal_Int32 INT32; /* typedef int INT32; previously "long" on Windows */ -typedef sal_uInt32 UINT32; /* typedef unsigned int UINT32; previously "unsigned long" on Windows */ +typedef sal_Int64 INT64; /* typedef long INT64; previously "void" on Windows */ +typedef sal_uInt64 UINT64; /* typedef unsigned long UINT64; previously "void" on Windows */ +typedef sal_Int32 INT32; /* typedef int INT32; previously "long" on Windows */ +typedef sal_uInt32 UINT32; /* typedef unsigned int UINT32; previously "unsigned long" on Windows */ #endif /* _SOLAR_NOUINT */ #endif /*** misc. macros to leverage platform and compiler differences ********/ -#define DELETEZ( p ) ( delete p,p = 0 ) +#define DELETEZ( p ) ( delete p,p = 0 ) #define __FAR_DATA -#define __READONLY_DATA const +#define __READONLY_DATA const #define __EXPORT #ifdef WNT @@ -114,22 +114,22 @@ typedef sal_uInt32 UINT32; /* typedef unsigned int UINT32; previously "unsi always little endian; not necessarily aligned */ -typedef BYTE SVBT8[1]; -typedef BYTE SVBT16[2]; -typedef BYTE SVBT32[4]; -typedef BYTE SVBT64[8]; +typedef BYTE SVBT8[1]; +typedef BYTE SVBT16[2]; +typedef BYTE SVBT32[4]; +typedef BYTE SVBT64[8]; #ifdef __cplusplus -inline BYTE SVBT8ToByte ( const SVBT8 p ) { return p[0]; } -inline USHORT SVBT16ToShort( const SVBT16 p ) { return (USHORT)p[0] +inline BYTE SVBT8ToByte ( const SVBT8 p ) { return p[0]; } +inline USHORT SVBT16ToShort( const SVBT16 p ) { return (USHORT)p[0] + ((USHORT)p[1] << 8); } -inline sal_uInt32 SVBT32ToUInt32 ( const SVBT32 p ) { return (sal_uInt32)p[0] +inline sal_uInt32 SVBT32ToUInt32 ( const SVBT32 p ) { return (sal_uInt32)p[0] + ((sal_uInt32)p[1] << 8) + ((sal_uInt32)p[2] << 16) + ((sal_uInt32)p[3] << 24); } #if defined OSL_LITENDIAN -inline double SVBT64ToDouble( const SVBT64 p ) { double n; +inline double SVBT64ToDouble( const SVBT64 p ) { double n; ((BYTE*)&n)[0] = p[0]; ((BYTE*)&n)[1] = p[1]; ((BYTE*)&n)[2] = p[2]; @@ -140,7 +140,7 @@ inline double SVBT64ToDouble( const SVBT64 p ) { double n; ((BYTE*)&n)[7] = p[7]; return n; } #else -inline double SVBT64ToDouble( const SVBT64 p ) { double n; +inline double SVBT64ToDouble( const SVBT64 p ) { double n; ((BYTE*)&n)[0] = p[7]; ((BYTE*)&n)[1] = p[6]; ((BYTE*)&n)[2] = p[5]; @@ -152,15 +152,15 @@ inline double SVBT64ToDouble( const SVBT64 p ) { double n; return n; } #endif -inline void ByteToSVBT8 ( BYTE n, SVBT8 p ) { p[0] = n; } -inline void ShortToSVBT16( USHORT n, SVBT16 p ) { p[0] = (BYTE) n; +inline void ByteToSVBT8 ( BYTE n, SVBT8 p ) { p[0] = n; } +inline void ShortToSVBT16( USHORT n, SVBT16 p ) { p[0] = (BYTE) n; p[1] = (BYTE)(n >> 8); } -inline void UInt32ToSVBT32 ( sal_uInt32 n, SVBT32 p ) { p[0] = (BYTE) n; +inline void UInt32ToSVBT32 ( sal_uInt32 n, SVBT32 p ) { p[0] = (BYTE) n; p[1] = (BYTE)(n >> 8); p[2] = (BYTE)(n >> 16); p[3] = (BYTE)(n >> 24); } #if defined OSL_LITENDIAN -inline void DoubleToSVBT64( double n, SVBT64 p ) { p[0] = ((BYTE*)&n)[0]; +inline void DoubleToSVBT64( double n, SVBT64 p ) { p[0] = ((BYTE*)&n)[0]; p[1] = ((BYTE*)&n)[1]; p[2] = ((BYTE*)&n)[2]; p[3] = ((BYTE*)&n)[3]; @@ -169,7 +169,7 @@ inline void DoubleToSVBT64( double n, SVBT64 p ) { p[0] = ((BYTE*)&n)[0]; p[6] = ((BYTE*)&n)[6]; p[7] = ((BYTE*)&n)[7]; } #else -inline void DoubleToSVBT64( double n, SVBT64 p ) { p[0] = ((BYTE*)&n)[7]; +inline void DoubleToSVBT64( double n, SVBT64 p ) { p[0] = ((BYTE*)&n)[7]; p[1] = ((BYTE*)&n)[6]; p[2] = ((BYTE*)&n)[5]; p[3] = ((BYTE*)&n)[4]; @@ -185,25 +185,25 @@ inline void DoubleToSVBT64( double n, SVBT64 p ) { p[0] = ((BYTE*)&n)[7]; /*** standard floating point definitions *******************************/ #ifndef F_PI -#define F_PI 3.14159265358979323846 +#define F_PI 3.14159265358979323846 #endif #ifndef F_PI2 -#define F_PI2 1.57079632679489661923 +#define F_PI2 1.57079632679489661923 #endif #ifndef F_PI4 -#define F_PI4 0.785398163397448309616 +#define F_PI4 0.785398163397448309616 #endif #ifndef F_PI180 -#define F_PI180 0.01745329251994 +#define F_PI180 0.01745329251994 #endif #ifndef F_PI1800 -#define F_PI1800 0.001745329251994 +#define F_PI1800 0.001745329251994 #endif #ifndef F_PI18000 -#define F_PI18000 0.0001745329251994 +#define F_PI18000 0.0001745329251994 #endif #ifndef F_2PI -#define F_2PI 6.28318530717958647694 +#define F_2PI 6.28318530717958647694 #endif @@ -215,10 +215,10 @@ inline void DoubleToSVBT64( double n, SVBT64 p ) { p[0] = ((BYTE*)&n)[7]; #ifndef __cplusplus #ifndef min -#define min(a,b) (((a) < (b)) ? (a) : (b)) +#define min(a,b) (((a) < (b)) ? (a) : (b)) #endif #ifndef max -#define max(a,b) (((a) > (b)) ? (a) : (b)) +#define max(a,b) (((a) > (b)) ? (a) : (b)) #endif #endif @@ -236,9 +236,9 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); } /*** C / C++ - macros **************************************************/ #ifdef __cplusplus -#define BEGIN_C extern "C" { -#define END_C } -#define EXTERN_C extern "C" +#define BEGIN_C extern "C" { +#define END_C } +#define EXTERN_C extern "C" #else #define BEGIN_C #define END_C @@ -254,11 +254,11 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); } #define HACK( comment ) #endif -#define _MAKE_NUMSTR( n ) # n -#define MAKE_NUMSTR( n ) _MAKE_NUMSTR( n ) +#define _MAKE_NUMSTR( n ) # n +#define MAKE_NUMSTR( n ) _MAKE_NUMSTR( n ) -#define _LF ((char)0x0A) -#define _CR ((char)0x0D) +#define _LF ((char)0x0A) +#define _CR ((char)0x0D) /*** pragmas ************************************************************/ @@ -276,40 +276,40 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); } /* dll file extensions *******************************************************/ /* many of these platforms are historic */ -#define SYSTEM_WINMSCI 1 -#define SYSTEM_WNTMSCI 2 -#define SYSTEM_WNTMSCA 3 -#define SYSTEM_WNTMSCP 4 -#define SYSTEM_WNTMSCM 5 -#define SYSTEM_OS2BLCI 6 -#define SYSTEM_OS2ICCI 7 -#define SYSTEM_OS2ICCI3 8 -#define SYSTEM_UNXLNXI 9 -#define SYSTEM_UNXSOLS 10 -#define SYSTEM_UNXBSDI 11 -#define SYSTEM_UNXBSDA 12 -#define SYSTEM_UNXSCOI 13 -#define SYSTEM_UNXAIXP 14 -#define SYSTEM_UNXHPXR 15 -#define SYSTEM_UNXSNIM 16 -#define SYSTEM_UNXMVSG 17 -#define SYSTEM_UNXIRXM 18 -// #define SYSTEM_MACOSP 19 -#define SYSTEM_UNXFBSDI 20 -#define SYSTEM_UNXSOLI 21 -#define SYSTEM_WINBLCI 22 -#define SYSTEM_UNXMACXP 23 -#define SYSTEM_UNXLNXP 24 -#define SYSTEM_UNXBSDS 25 -#define SYSTEM_UNXLNXR 26 -#define SYSTEM_UNXLNX3 28 -#define SYSTEM_UNXLNXS 29 -#define SYSTEM_UNXLNXX 30 -#define SYSTEM_UNXSOGS 31 -#define SYSTEM_UNXSOGI 32 -#define SYSTEM_UNXMACXI 33 -#define SYSTEM_OS2GCCI 34 -#define SYSTEM_WNTGCCI 99 +#define SYSTEM_WINMSCI 1 +#define SYSTEM_WNTMSCI 2 +#define SYSTEM_WNTMSCA 3 +#define SYSTEM_WNTMSCP 4 +#define SYSTEM_WNTMSCM 5 +#define SYSTEM_OS2BLCI 6 +#define SYSTEM_OS2ICCI 7 +#define SYSTEM_OS2ICCI3 8 +#define SYSTEM_UNXLNXI 9 +#define SYSTEM_UNXSOLS 10 +#define SYSTEM_UNXBSDI 11 +#define SYSTEM_UNXBSDA 12 +#define SYSTEM_UNXSCOI 13 +#define SYSTEM_UNXAIXP 14 +#define SYSTEM_UNXHPXR 15 +#define SYSTEM_UNXSNIM 16 +#define SYSTEM_UNXMVSG 17 +#define SYSTEM_UNXIRXM 18 +// #define SYSTEM_MACOSP 19 +#define SYSTEM_UNXFBSDI 20 +#define SYSTEM_UNXSOLI 21 +#define SYSTEM_WINBLCI 22 +#define SYSTEM_UNXMACXP 23 +#define SYSTEM_UNXLNXP 24 +#define SYSTEM_UNXBSDS 25 +#define SYSTEM_UNXLNXR 26 +#define SYSTEM_UNXLNX3 28 +#define SYSTEM_UNXLNXS 29 +#define SYSTEM_UNXLNXX 30 +#define SYSTEM_UNXSOGS 31 +#define SYSTEM_UNXSOGI 32 +#define SYSTEM_UNXMACXI 33 +#define SYSTEM_OS2GCCI 34 +#define SYSTEM_WNTGCCI 99 #if defined WNT #if defined(__MINGW32__) @@ -385,23 +385,23 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); } #define NOOLDSTRING #ifndef NOREPLACESTRING -#define UniString String -#define XubString String +#define UniString String +#define XubString String #else -#define XubString UniString +#define XubString UniString #endif -#define xub_Unicode sal_Unicode -#define xub_uUnicode sal_Unicode +#define xub_Unicode sal_Unicode +#define xub_uUnicode sal_Unicode #ifdef STRING32 -#define xub_StrLen sal_uInt32 +#define xub_StrLen sal_uInt32 #else -#define xub_StrLen USHORT +#define xub_StrLen USHORT #endif // -- moved here from libcall.hxx ---------------------------------------- -#define LIBRARY_STR(s) # s -#define LIBRARY_STRING(s) LIBRARY_STR(s) +#define LIBRARY_STR(s) # s +#define LIBRARY_STRING(s) LIBRARY_STR(s) #define GETFUNCTION( s ) GetFunction( s ) #define LIBRARY_CONCAT3( s1, s2, s3 ) \ @@ -437,4 +437,4 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); } LIBRARYFILENAME_CONCAT3( str, __DLLEXTENSION, ".dll" ) #endif -#endif /* _SOLAR_H */ +#endif /* _SOLAR_H */ diff --git a/tools/inc/tools/solarmutex.hxx b/tools/inc/tools/solarmutex.hxx index a0e1d4ed87dd..f8b784c9f9ae 100644 --- a/tools/inc/tools/solarmutex.hxx +++ b/tools/inc/tools/solarmutex.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/stack.hxx b/tools/inc/tools/stack.hxx index aead3da51f20..4f3223295114 100644 --- a/tools/inc/tools/stack.hxx +++ b/tools/inc/tools/stack.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,8 +69,8 @@ public: class ClassName : private Stack \ { \ public: \ - using Stack::Clear; \ - using Stack::Count; \ + using Stack::Clear; \ + using Stack::Count; \ \ ClassName( USHORT _nInitSize = 16, \ USHORT _nReSize = 16 ) : \ diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index 0ce15bc3470b..61af361aa5b7 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,56 +58,56 @@ inline rtl_TextEncoding GetStoreCharSet( rtl_TextEncoding eEncoding ) typedef sal_uInt16 StreamMode; // read, write, create,... options -#define STREAM_READ 0x0001 // allow read accesses -#define STREAM_WRITE 0x0002 // allow write accesses +#define STREAM_READ 0x0001 // allow read accesses +#define STREAM_WRITE 0x0002 // allow write accesses // file i/o -#define STREAM_NOCREATE 0x0004 // 1 == Dont create file -#define STREAM_TRUNC 0x0008 // Truncate _existing_ file to zero length -#define STREAM_COPY_ON_SYMLINK 0x0010 // copy-on-write for symlinks (UNX) +#define STREAM_NOCREATE 0x0004 // 1 == Dont create file +#define STREAM_TRUNC 0x0008 // Truncate _existing_ file to zero length +#define STREAM_COPY_ON_SYMLINK 0x0010 // copy-on-write for symlinks (UNX) -#define STREAM_READWRITEBITS (STREAM_READ | STREAM_WRITE | \ +#define STREAM_READWRITEBITS (STREAM_READ | STREAM_WRITE | \ STREAM_NOCREATE | STREAM_TRUNC) // sharing options -#define STREAM_SHARE_DENYNONE 0x0100 -#define STREAM_SHARE_DENYREAD 0x0200 // overrides denynone -#define STREAM_SHARE_DENYWRITE 0x0400 // overrides denynone -#define STREAM_SHARE_DENYALL 0x0800 // overrides denyread,write,none +#define STREAM_SHARE_DENYNONE 0x0100 +#define STREAM_SHARE_DENYREAD 0x0200 // overrides denynone +#define STREAM_SHARE_DENYWRITE 0x0400 // overrides denynone +#define STREAM_SHARE_DENYALL 0x0800 // overrides denyread,write,none -#define STREAM_SHAREBITS (STREAM_SHARE_DENYNONE | STREAM_SHARE_DENYREAD |\ +#define STREAM_SHAREBITS (STREAM_SHARE_DENYNONE | STREAM_SHARE_DENYREAD |\ STREAM_SHARE_DENYWRITE | STREAM_SHARE_DENYALL) -#define STREAM_READWRITE (STREAM_READ | STREAM_WRITE) -#define STREAM_SHARE_DENYREADWRITE (STREAM_SHARE_DENYREAD | STREAM_SHARE_DENYWRITE) +#define STREAM_READWRITE (STREAM_READ | STREAM_WRITE) +#define STREAM_SHARE_DENYREADWRITE (STREAM_SHARE_DENYREAD | STREAM_SHARE_DENYWRITE) -#define STREAM_STD_READ (STREAM_READ | STREAM_SHARE_DENYNONE | STREAM_NOCREATE) -#define STREAM_STD_WRITE (STREAM_WRITE | STREAM_SHARE_DENYALL) -#define STREAM_STD_READWRITE (STREAM_READWRITE | STREAM_SHARE_DENYALL) +#define STREAM_STD_READ (STREAM_READ | STREAM_SHARE_DENYNONE | STREAM_NOCREATE) +#define STREAM_STD_WRITE (STREAM_WRITE | STREAM_SHARE_DENYALL) +#define STREAM_STD_READWRITE (STREAM_READWRITE | STREAM_SHARE_DENYALL) -#define STREAM_SEEK_TO_BEGIN 0L -#define STREAM_SEEK_TO_END ULONG_MAX +#define STREAM_SEEK_TO_BEGIN 0L +#define STREAM_SEEK_TO_END ULONG_MAX -#define NUMBERFORMAT_INT_BIGENDIAN (sal_uInt16)0x0000 -#define NUMBERFORMAT_INT_LITTLEENDIAN (sal_uInt16)0xFFFF +#define NUMBERFORMAT_INT_BIGENDIAN (sal_uInt16)0x0000 +#define NUMBERFORMAT_INT_LITTLEENDIAN (sal_uInt16)0xFFFF -#define COMPRESSMODE_FULL (sal_uInt16)0xFFFF -#define COMPRESSMODE_NONE (sal_uInt16)0x0000 -#define COMPRESSMODE_ZBITMAP (sal_uInt16)0x0001 -#define COMPRESSMODE_NATIVE (sal_uInt16)0x0010 +#define COMPRESSMODE_FULL (sal_uInt16)0xFFFF +#define COMPRESSMODE_NONE (sal_uInt16)0x0000 +#define COMPRESSMODE_ZBITMAP (sal_uInt16)0x0001 +#define COMPRESSMODE_NATIVE (sal_uInt16)0x0010 -#define JUSTIFY_RIGHT 0x00 -#define JUSTIFY_LEFT 0x01 +#define JUSTIFY_RIGHT 0x00 +#define JUSTIFY_LEFT 0x01 -#define STREAM_IO_DONTKNOW 0 -#define STREAM_IO_READ 1 -#define STREAM_IO_WRITE 2 +#define STREAM_IO_DONTKNOW 0 +#define STREAM_IO_READ 1 +#define STREAM_IO_WRITE 2 -#define ID_STREAM 1 -#define ID_FILESTREAM 2 -#define ID_MEMORYSTREAM 3 -#define ID_SHAREDMEMORYSTREAM 4 -#define ID_STORAGESTREAM 5 -#define ID_PERSISTSTREAM 6 +#define ID_STREAM 1 +#define ID_FILESTREAM 2 +#define ID_MEMORYSTREAM 3 +#define ID_SHAREDMEMORYSTREAM 4 +#define ID_STORAGESTREAM 5 +#define ID_PERSISTSTREAM 6 class SvStream; typedef SvStream& (*SvStrPtr)( SvStream& ); @@ -241,264 +241,264 @@ class TOOLS_DLLPUBLIC SvStream { private: // LockBytes Interface - void* pImp; // unused - SvLockBytesRef xLockBytes; // Default Implmentierung - sal_Size nActPos; // + void* pImp; // unused + SvLockBytesRef xLockBytes; // Default Implmentierung + sal_Size nActPos; // // Puffer-Verwaltung - sal_uInt8* pRWBuf; // Zeigt auf Read/Write-Puffer - sal_uInt8* pBufPos; // pRWBuf + nBufActualPos - sal_uInt16 nBufSize; // Allozierte Groesse des Puffers - sal_uInt16 nBufActualLen; // Laenge des beschriebenen Teils des Puffers + sal_uInt8* pRWBuf; // Zeigt auf Read/Write-Puffer + sal_uInt8* pBufPos; // pRWBuf + nBufActualPos + sal_uInt16 nBufSize; // Allozierte Groesse des Puffers + sal_uInt16 nBufActualLen; // Laenge des beschriebenen Teils des Puffers // Entspricht nBufSize, wenn EOF nicht // ueberschritten wurde - sal_uInt16 nBufActualPos; // aktuelle Position im Puffer (0..nBufSize-1) - sal_uInt16 nBufFree; // freier Platz im Puffer fuer IO vom Typ eIOMode - unsigned int eIOMode:2; // STREAM_IO_* + sal_uInt16 nBufActualPos; // aktuelle Position im Puffer (0..nBufSize-1) + sal_uInt16 nBufFree; // freier Platz im Puffer fuer IO vom Typ eIOMode + unsigned int eIOMode:2; // STREAM_IO_* // Error-Codes, Konvertierung, Komprimierung, ... - int bIsDirty:1; // TRUE: Stream != Pufferinhalt - int bIsConsistent:1;// FALSE: Buffer enthaelt Daten, die NICHT + int bIsDirty:1; // TRUE: Stream != Pufferinhalt + int bIsConsistent:1;// FALSE: Buffer enthaelt Daten, die NICHT // per PutData in den abgeleiteten Stream // geschrieben werden duerfen (siehe PutBack) - int bSwap:1; - int bIsEof:1; - sal_uInt32 nError; - sal_uInt16 nNumberFormatInt; - sal_uInt16 nCompressMode; - LineEnd eLineDelimiter; - CharSet eStreamCharSet; -// CharSet eTargetCharSet; + int bSwap:1; + int bIsEof:1; + sal_uInt32 nError; + sal_uInt16 nNumberFormatInt; + sal_uInt16 nCompressMode; + LineEnd eLineDelimiter; + CharSet eStreamCharSet; +// CharSet eTargetCharSet; // Verschluesselung - ByteString aKey; // aKey.Len != 0 -> Verschluesselung - unsigned char nCryptMask; + ByteString aKey; // aKey.Len != 0 -> Verschluesselung + unsigned char nCryptMask; // Formatierung von Strings - char cFiller; - sal_uInt8 nRadix; - sal_uInt8 nPrecision; - sal_uInt8 nWidth; - sal_uInt8 nPrintfParams; - sal_uInt8 nJustification; - ByteString aFormatString; + char cFiller; + sal_uInt8 nRadix; + sal_uInt8 nPrecision; + sal_uInt8 nWidth; + sal_uInt8 nPrintfParams; + sal_uInt8 nJustification; + ByteString aFormatString; // Userdata - long nVersion; // for external use + long nVersion; // for external use // Hilfsmethoden - void CreateFormatString(); - TOOLS_DLLPRIVATE void ImpInit(); + void CreateFormatString(); + TOOLS_DLLPRIVATE void ImpInit(); SvStream ( const SvStream& rStream ); // not implemented - SvStream& operator=( const SvStream& rStream ); // not implemented + SvStream& operator=( const SvStream& rStream ); // not implemented protected: - sal_Size nBufFilePos; // Fileposition von pBuf[0] - sal_uInt16 eStreamMode; - sal_Bool bIsWritable; + sal_Size nBufFilePos; // Fileposition von pBuf[0] + sal_uInt16 eStreamMode; + sal_Bool bIsWritable; - virtual sal_Size GetData( void* pData, sal_Size nSize ); - virtual sal_Size PutData( const void* pData, sal_Size nSize ); - virtual sal_Size SeekPos( sal_Size nPos ); - virtual void FlushData(); - virtual void SetSize( sal_Size nSize ); + virtual sal_Size GetData( void* pData, sal_Size nSize ); + virtual sal_Size PutData( const void* pData, sal_Size nSize ); + virtual sal_Size SeekPos( sal_Size nPos ); + virtual void FlushData(); + virtual void SetSize( sal_Size nSize ); - void ClearError(); - void ClearBuffer(); + void ClearError(); + void ClearBuffer(); // verschluesselt & schreibt blockweise - sal_Size CryptAndWriteBuffer( const void* pStart, sal_Size nLen ); - sal_Bool EncryptBuffer( void* pStart, sal_Size nLen ); + sal_Size CryptAndWriteBuffer( const void* pStart, sal_Size nLen ); + sal_Bool EncryptBuffer( void* pStart, sal_Size nLen ); - void SyncSvStream( sal_Size nNewStreamPos ); // SvStream <- Medium - void SyncSysStream(); // SvStream -> Medium + void SyncSvStream( sal_Size nNewStreamPos ); // SvStream <- Medium + void SyncSysStream(); // SvStream -> Medium public: SvStream(); SvStream( SvLockBytes *pLockBytes); - virtual ~SvStream(); + virtual ~SvStream(); - ErrCode SetLockBytes( SvLockBytesRef& rBytes ); - SvLockBytes* GetLockBytes() const { return xLockBytes; } + ErrCode SetLockBytes( SvLockBytesRef& rBytes ); + SvLockBytes* GetLockBytes() const { return xLockBytes; } - sal_uInt32 GetError() const { return ERRCODE_TOERROR(nError); } - sal_uInt32 GetErrorCode() const { return nError; } + sal_uInt32 GetError() const { return ERRCODE_TOERROR(nError); } + sal_uInt32 GetErrorCode() const { return nError; } - void SetError( sal_uInt32 nErrorCode ); - virtual void ResetError(); + void SetError( sal_uInt32 nErrorCode ); + virtual void ResetError(); - void SetNumberFormatInt( sal_uInt16 nNewFormat ); - sal_uInt16 GetNumberFormatInt() const { return nNumberFormatInt; } + void SetNumberFormatInt( sal_uInt16 nNewFormat ); + sal_uInt16 GetNumberFormatInt() const { return nNumberFormatInt; } /// Enable/disable swapping of endians, may be needed for Unicode import/export - inline void SetEndianSwap( sal_Bool bVal ); + inline void SetEndianSwap( sal_Bool bVal ); // returns status of endian swap flag - sal_Bool IsEndianSwap() const { return 0 != bSwap; } + sal_Bool IsEndianSwap() const { return 0 != bSwap; } - void SetCompressMode( sal_uInt16 nNewMode ) + void SetCompressMode( sal_uInt16 nNewMode ) { nCompressMode = nNewMode; } - sal_uInt16 GetCompressMode() const { return nCompressMode; } + sal_uInt16 GetCompressMode() const { return nCompressMode; } - void SetKey( const ByteString& rKey ); - const ByteString& GetKey() const { return aKey; } + void SetKey( const ByteString& rKey ); + const ByteString& GetKey() const { return aKey; } - void SetStreamCharSet( CharSet eCharSet ) + void SetStreamCharSet( CharSet eCharSet ) { eStreamCharSet = eCharSet; } - CharSet GetStreamCharSet() const { return eStreamCharSet; } -// void SetTargetCharSet( CharSet eCharSet ) -// { eTargetCharSet = eCharSet; } -// CharSet GetTargetCharSet() const { return eTargetCharSet; } + CharSet GetStreamCharSet() const { return eStreamCharSet; } +// void SetTargetCharSet( CharSet eCharSet ) +// { eTargetCharSet = eCharSet; } +// CharSet GetTargetCharSet() const { return eTargetCharSet; } - void SetLineDelimiter( LineEnd eLineEnd ) + void SetLineDelimiter( LineEnd eLineEnd ) { eLineDelimiter = eLineEnd; } - LineEnd GetLineDelimiter() const { return eLineDelimiter; } - - SvStream& operator>>( sal_uInt16& rUInt16 ); - SvStream& operator>>( sal_uInt32& rUInt32 ); - SvStream& operator>>( long& rLong ); - SvStream& operator>>( short& rShort ); - SvStream& operator>>( int& rInt ); - SvStream& operator>>( signed char& rChar ); - SvStream& operator>>( char& rChar ); - SvStream& operator>>( unsigned char& rChar ); - SvStream& operator>>( float& rFloat ); - SvStream& operator>>( double& rDouble ); + LineEnd GetLineDelimiter() const { return eLineDelimiter; } + + SvStream& operator>>( sal_uInt16& rUInt16 ); + SvStream& operator>>( sal_uInt32& rUInt32 ); + SvStream& operator>>( long& rLong ); + SvStream& operator>>( short& rShort ); + SvStream& operator>>( int& rInt ); + SvStream& operator>>( signed char& rChar ); + SvStream& operator>>( char& rChar ); + SvStream& operator>>( unsigned char& rChar ); + SvStream& operator>>( float& rFloat ); + SvStream& operator>>( double& rDouble ); #ifdef ENABLE_BYTESTRING_STREAM_OPERATORS - SvStream& operator>>( ByteString& rString ) { return ReadByteString(rString); } + SvStream& operator>>( ByteString& rString ) { return ReadByteString(rString); } #endif #ifdef ENABLE_STRING_STREAM_OPERATORS - SvStream& operator>>( UniString& rString ) { return ReadByteString(rString); } + SvStream& operator>>( UniString& rString ) { return ReadByteString(rString); } #endif - SvStream& operator>>( SvStream& rStream ); - - SvStream& operator<<( sal_uInt16 nUInt16 ); - SvStream& operator<<( sal_uInt32 nUInt32 ); - SvStream& operator<<( long nLong ); - SvStream& operator<<( short nShort ); - SvStream& operator<<( int nInt ); - SvStream& operator<<( signed char nChar ); - SvStream& operator<<( char nChar ); - SvStream& operator<<( unsigned char nChar ); - SvStream& operator<<( float nFloat ); - SvStream& operator<<( const double& rDouble ); - SvStream& operator<<( const char* pBuf ); - SvStream& operator<<( const unsigned char* pBuf ); + SvStream& operator>>( SvStream& rStream ); + + SvStream& operator<<( sal_uInt16 nUInt16 ); + SvStream& operator<<( sal_uInt32 nUInt32 ); + SvStream& operator<<( long nLong ); + SvStream& operator<<( short nShort ); + SvStream& operator<<( int nInt ); + SvStream& operator<<( signed char nChar ); + SvStream& operator<<( char nChar ); + SvStream& operator<<( unsigned char nChar ); + SvStream& operator<<( float nFloat ); + SvStream& operator<<( const double& rDouble ); + SvStream& operator<<( const char* pBuf ); + SvStream& operator<<( const unsigned char* pBuf ); #ifdef ENABLE_BYTESTRING_STREAM_OPERATORS - SvStream& operator<<( const ByteString& rString ) { return WriteByteString( rString ); } + SvStream& operator<<( const ByteString& rString ) { return WriteByteString( rString ); } #endif #ifdef ENABLE_STRING_STREAM_OPERATORS - SvStream& operator<<( const UniString& rString ) { return WriteByteString(rString); } + SvStream& operator<<( const UniString& rString ) { return WriteByteString(rString); } #endif - SvStream& operator<<( SvStream& rStream ); + SvStream& operator<<( SvStream& rStream ); - SvStream& ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet ); - SvStream& ReadByteString( UniString& rStr ) { return ReadByteString( rStr, GetStreamCharSet() ); } + SvStream& ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet ); + SvStream& ReadByteString( UniString& rStr ) { return ReadByteString( rStr, GetStreamCharSet() ); } SvStream& ReadByteString( ByteString& rStr ); - SvStream& WriteByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet ); - SvStream& WriteByteString( const UniString& rStr ) { return WriteByteString( rStr, GetStreamCharSet() ); } + SvStream& WriteByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet ); + SvStream& WriteByteString( const UniString& rStr ) { return WriteByteString( rStr, GetStreamCharSet() ); } SvStream& WriteByteString( const ByteString& rStr ); - void SetRadix( sal_uInt8 nRad ) + void SetRadix( sal_uInt8 nRad ) { nRadix = nRad; CreateFormatString(); } - sal_uInt8 GetRadix() const { return nRadix; } - void SetPrecision( sal_uInt8 nPrec ) + sal_uInt8 GetRadix() const { return nRadix; } + void SetPrecision( sal_uInt8 nPrec ) { nPrecision = nPrec; CreateFormatString(); } - sal_uInt8 GetPrecision() const { return nPrecision; } - void SetWidth( sal_uInt8 nWid) + sal_uInt8 GetPrecision() const { return nPrecision; } + void SetWidth( sal_uInt8 nWid) { nWidth = nWid; CreateFormatString(); } - sal_uInt8 GetWidth() const { return nWidth; } - void SetFiller( char cFil ) + sal_uInt8 GetWidth() const { return nWidth; } + void SetFiller( char cFil ) { cFiller = cFil; CreateFormatString(); } - char GetFiller() const { return cFiller; } - void SetJustification( sal_uInt8 nJus ) + char GetFiller() const { return cFiller; } + void SetJustification( sal_uInt8 nJus ) { nJustification = nJus; CreateFormatString(); } - sal_uInt8 GetJustification() const { return nJustification; } - - SvStream& ReadNumber( short& rShort ); - SvStream& ReadNumber( sal_uInt16& rUInt16 ); - SvStream& ReadNumber( long& rLong ); - SvStream& ReadNumber( sal_uInt32& rUInt32 ); - SvStream& ReadNumber( int& rInt ); - SvStream& ReadNumber( float& rFloat ); - SvStream& ReadNumber( double& rDouble ); - - SvStream& WriteNumber( short nShort ); - SvStream& WriteNumber( sal_uInt16 nUInt16 ); - SvStream& WriteNumber( long nLong ); - SvStream& WriteNumber( sal_uInt32 nUInt32 ); - SvStream& WriteNumber( int nInt ); - SvStream& WriteNumber( float nFloat ); - SvStream& WriteNumber( const double& rDouble ); - - sal_Size Read( void* pData, sal_Size nSize ); - sal_Size Write( const void* pData, sal_Size nSize ); - sal_Size Seek( sal_Size nPos ); - sal_Size SeekRel( sal_sSize nPos ); - sal_Size Tell() const { return nBufFilePos+nBufActualPos; } - void Flush(); - sal_Bool IsEof() const { return bIsEof; } + sal_uInt8 GetJustification() const { return nJustification; } + + SvStream& ReadNumber( short& rShort ); + SvStream& ReadNumber( sal_uInt16& rUInt16 ); + SvStream& ReadNumber( long& rLong ); + SvStream& ReadNumber( sal_uInt32& rUInt32 ); + SvStream& ReadNumber( int& rInt ); + SvStream& ReadNumber( float& rFloat ); + SvStream& ReadNumber( double& rDouble ); + + SvStream& WriteNumber( short nShort ); + SvStream& WriteNumber( sal_uInt16 nUInt16 ); + SvStream& WriteNumber( long nLong ); + SvStream& WriteNumber( sal_uInt32 nUInt32 ); + SvStream& WriteNumber( int nInt ); + SvStream& WriteNumber( float nFloat ); + SvStream& WriteNumber( const double& rDouble ); + + sal_Size Read( void* pData, sal_Size nSize ); + sal_Size Write( const void* pData, sal_Size nSize ); + sal_Size Seek( sal_Size nPos ); + sal_Size SeekRel( sal_sSize nPos ); + sal_Size Tell() const { return nBufFilePos+nBufActualPos; } + void Flush(); + sal_Bool IsEof() const { return bIsEof; } // next Tell() <= nSize - sal_Bool SetStreamSize( sal_Size nSize ); + sal_Bool SetStreamSize( sal_Size nSize ); /// Read in the stream to a zero character and put all /// read chracters in the Bytestring. The String interface /// convert the BytString with the given encoding to a String - sal_Bool ReadCString( ByteString& rStr ); - sal_Bool ReadCString( String& rStr, rtl_TextEncoding eToEncode ); - sal_Bool ReadCString( String& rStr ) { return ReadCString( rStr, GetStreamCharSet()); } + sal_Bool ReadCString( ByteString& rStr ); + sal_Bool ReadCString( String& rStr, rtl_TextEncoding eToEncode ); + sal_Bool ReadCString( String& rStr ) { return ReadCString( rStr, GetStreamCharSet()); } - sal_Bool ReadLine( ByteString& rStr ); - sal_Bool WriteLine( const ByteString& rStr ); - sal_Bool WriteLines( const ByteString& rStr ); + sal_Bool ReadLine( ByteString& rStr ); + sal_Bool WriteLine( const ByteString& rStr ); + sal_Bool WriteLines( const ByteString& rStr ); - sal_Bool ReadByteStringLine( String& rStr, rtl_TextEncoding eSrcCharSet ); - sal_Bool ReadByteStringLine( String& rStr ) { return ReadByteStringLine( rStr, GetStreamCharSet()); } - sal_Bool WriteByteStringLine( const String& rStr, rtl_TextEncoding eDestCharSet ); - sal_Bool WriteByteStringLine( const String& rStr ) { return WriteByteStringLine( rStr, GetStreamCharSet()); } - sal_Bool WriteByteStringLines( const String& rStr, rtl_TextEncoding eDestCharSet ); - sal_Bool WriteByteStringLines( const String& rStr ) { return WriteByteStringLine( rStr, GetStreamCharSet()); } + sal_Bool ReadByteStringLine( String& rStr, rtl_TextEncoding eSrcCharSet ); + sal_Bool ReadByteStringLine( String& rStr ) { return ReadByteStringLine( rStr, GetStreamCharSet()); } + sal_Bool WriteByteStringLine( const String& rStr, rtl_TextEncoding eDestCharSet ); + sal_Bool WriteByteStringLine( const String& rStr ) { return WriteByteStringLine( rStr, GetStreamCharSet()); } + sal_Bool WriteByteStringLines( const String& rStr, rtl_TextEncoding eDestCharSet ); + sal_Bool WriteByteStringLines( const String& rStr ) { return WriteByteStringLine( rStr, GetStreamCharSet()); } /// Switch to no endian swapping and write 0xfeff - sal_Bool StartWritingUnicodeText(); + sal_Bool StartWritingUnicodeText(); /// Read 16bit, if 0xfeff do nothing, if 0xfffe switch /// endian swapping, if none of them put back - sal_Bool StartReadingUnicodeText(); + sal_Bool StartReadingUnicodeText(); /// Read a line of Unicode - sal_Bool ReadUniStringLine( String& rStr ); + sal_Bool ReadUniStringLine( String& rStr ); /// Read a line of Unicode if eSrcCharSet==RTL_TEXTENCODING_UNICODE, /// otherwise read a line of Bytecode and convert from eSrcCharSet - sal_Bool ReadUniOrByteStringLine( String& rStr, rtl_TextEncoding eSrcCharSet ); - sal_Bool ReadUniOrByteStringLine( String& rStr ) + sal_Bool ReadUniOrByteStringLine( String& rStr, rtl_TextEncoding eSrcCharSet ); + sal_Bool ReadUniOrByteStringLine( String& rStr ) { return ReadUniOrByteStringLine( rStr, GetStreamCharSet() ); } /// Write a sequence of Unicode characters - sal_Bool WriteUnicodeText( const String& rStr ); + sal_Bool WriteUnicodeText( const String& rStr ); /// Write a sequence of Unicode characters if eDestCharSet==RTL_TEXTENCODING_UNICODE, /// otherwise write a sequence of Bytecodes converted to eDestCharSet - sal_Bool WriteUnicodeOrByteText( const String& rStr, rtl_TextEncoding eDestCharSet ); - sal_Bool WriteUnicodeOrByteText( const String& rStr ) + sal_Bool WriteUnicodeOrByteText( const String& rStr, rtl_TextEncoding eDestCharSet ); + sal_Bool WriteUnicodeOrByteText( const String& rStr ) { return WriteUnicodeOrByteText( rStr, GetStreamCharSet() ); } /// Write a line of Unicode and append line end (endlu()) - sal_Bool WriteUniStringLine( const String& rStr ); + sal_Bool WriteUniStringLine( const String& rStr ); /// Write multiple lines of Unicode (with CovertLineEnd) and append line end (endlu()) - sal_Bool WriteUniStringLines( const String& rStr ); + sal_Bool WriteUniStringLines( const String& rStr ); /// Write a line of Unicode if eDestCharSet==RTL_TEXTENCODING_UNICODE, /// otherwise write a line of Bytecode converted to eDestCharSet - sal_Bool WriteUniOrByteStringLine( const String& rStr, rtl_TextEncoding eDestCharSet ); - sal_Bool WriteUniOrByteStringLine( const String& rStr ) + sal_Bool WriteUniOrByteStringLine( const String& rStr, rtl_TextEncoding eDestCharSet ); + sal_Bool WriteUniOrByteStringLine( const String& rStr ) { return WriteUniOrByteStringLine( rStr, GetStreamCharSet() ); } /// Write multiple lines of Unicode if eDestCharSet==RTL_TEXTENCODING_UNICODE, /// otherwise write multiple lines of Bytecode converted to eDestCharSet, /// CovertLineEnd is applied. - sal_Bool WriteUniOrByteStringLines( const String& rStr, rtl_TextEncoding eDestCharSet ); - sal_Bool WriteUniOrByteStringLines( const String& rStr ) + sal_Bool WriteUniOrByteStringLines( const String& rStr, rtl_TextEncoding eDestCharSet ); + sal_Bool WriteUniOrByteStringLines( const String& rStr ) { return WriteUniOrByteStringLines( rStr, GetStreamCharSet() ); } /// Write a Unicode character if eDestCharSet==RTL_TEXTENCODING_UNICODE, /// otherwise write as Bytecode converted to eDestCharSet. /// This may result in more than one byte being written /// if a multi byte encoding (e.g. UTF7, UTF8) is chosen. - sal_Bool WriteUniOrByteChar( sal_Unicode ch, rtl_TextEncoding eDestCharSet ); - sal_Bool WriteUniOrByteChar( sal_Unicode ch ) + sal_Bool WriteUniOrByteChar( sal_Unicode ch, rtl_TextEncoding eDestCharSet ); + sal_Bool WriteUniOrByteChar( sal_Unicode ch ) { return WriteUniOrByteChar( ch, GetStreamCharSet() ); } /** Read a CSV (comma separated values) data line using @@ -556,61 +556,61 @@ public: const String& rFieldSeparators, sal_Unicode cFieldQuote, sal_Bool bAllowBackslashEscape = sal_False); - void SetBufferSize( sal_uInt16 nBufSize ); - sal_uInt16 GetBufferSize() const { return nBufSize; } + void SetBufferSize( sal_uInt16 nBufSize ); + sal_uInt16 GetBufferSize() const { return nBufSize; } - void RefreshBuffer(); - SvStream& PutBack( char aCh ); - void EatWhite(); + void RefreshBuffer(); + SvStream& PutBack( char aCh ); + void EatWhite(); - sal_Bool IsWritable() const { return bIsWritable; } - StreamMode GetStreamMode() const { return eStreamMode; } - virtual sal_uInt16 IsA() const; + sal_Bool IsWritable() const { return bIsWritable; } + StreamMode GetStreamMode() const { return eStreamMode; } + virtual sal_uInt16 IsA() const; - long GetVersion() { return nVersion; } - void SetVersion( long n ) { nVersion = n; } + long GetVersion() { return nVersion; } + void SetVersion( long n ) { nVersion = n; } /** Add a mark to indicate to which position in the stream you want to be able to seek back. - @descr If you set a mark at nPos, you indicate to the stream that you + @descr If you set a mark at nPos, you indicate to the stream that you won't issue seek operations to any position 'before' nPos. This can be exploited by 'transient streams' that do not permanently store their data; they can discard any buffered data up to nPos. - @descr However, if the stream is already positioned past nPos, this + @descr However, if the stream is already positioned past nPos, this method is not guaranteed to have the desired effect. A 'transient stream' may have already discarded the buffered data at nPos, so that a seek operation to nPos will fail nonetheless. - @descr There can be more than one mark for a stream, indicating that + @descr There can be more than one mark for a stream, indicating that you want to be able to seek back in the stream as far as the 'lowest' - off all the marks. There can even be multiple marks at the same + off all the marks. There can even be multiple marks at the same position (and they must all be individually removed with RemoveMark()). @param nPos The position in the stream at which to add a mark. */ - virtual void AddMark(sal_Size nPos); + virtual void AddMark(sal_Size nPos); /** Remove a mark introduced with AddMark(). - @descr If you no longer need to seek back to some position for which - you added a mark, you should remove that mark. (And a 'transient + @descr If you no longer need to seek back to some position for which + you added a mark, you should remove that mark. (And a 'transient stream' that does not permanently store its data can then potentially discard some of its buffered data.) - @descr Removing one mark does not have any effects on any other - marks. Especially, if you have multiple marks at the same position, + @descr Removing one mark does not have any effects on any other + marks. Especially, if you have multiple marks at the same position, you must call this method multiple times to effectively 'unmark' that position. - @descr If you specify a position for which there is no mark, this + @descr If you specify a position for which there is no mark, this method simply has no effect. @param nPos The position in the stream at which to remove the mark. */ - virtual void RemoveMark(sal_Size nPos); + virtual void RemoveMark(sal_Size nPos); friend SvStream& operator<<( SvStream& rStr, SvStrPtr f ); // fuer Manips }; @@ -722,11 +722,11 @@ class TOOLS_DLLPUBLIC SvFileStream : public SvStream friend class FileCopier; private: - StreamData* pInstanceData; - String aFilename; - sal_uInt16 nLockCounter; - sal_Bool bIsOpen; - sal_uInt32 GetFileHandle() const; + StreamData* pInstanceData; + String aFilename; + sal_uInt16 nLockCounter; + sal_Bool bIsOpen; + sal_uInt32 GetFileHandle() const; // Forbidden and not implemented. SvFileStream (const SvFileStream&); @@ -734,11 +734,11 @@ private: protected: - virtual sal_Size GetData( void* pData, sal_Size nSize ); - virtual sal_Size PutData( const void* pData, sal_Size nSize ); - virtual sal_Size SeekPos( sal_Size nPos ); - virtual void SetSize( sal_Size nSize ); - virtual void FlushData(); + virtual sal_Size GetData( void* pData, sal_Size nSize ); + virtual sal_Size PutData( const void* pData, sal_Size nSize ); + virtual sal_Size SeekPos( sal_Size nPos ); + virtual void SetSize( sal_Size nSize ); + virtual void FlushData(); public: // Schaltet bei fehlgeschlagenem Schreiboeffnen auf Lesen zurueck @@ -746,21 +746,21 @@ public: SvFileStream(); ~SvFileStream(); - virtual void ResetError(); + virtual void ResetError(); - sal_Bool LockRange( sal_Size nByteOffset, sal_Size nBytes ); - sal_Bool UnlockRange( sal_Size nByteOffset, sal_Size nBytes ); - sal_Bool LockFile(); - sal_Bool UnlockFile(); + sal_Bool LockRange( sal_Size nByteOffset, sal_Size nBytes ); + sal_Bool UnlockRange( sal_Size nByteOffset, sal_Size nBytes ); + sal_Bool LockFile(); + sal_Bool UnlockFile(); - void Open( const String& rFileName, StreamMode eOpenMode ); - void Close(); - void ReOpen(); // Aufruf nach Close, FilePointer == 0 - sal_Bool IsOpen() const { return bIsOpen; } - sal_Bool IsLocked() const { return ( nLockCounter!=0 ); } - virtual sal_uInt16 IsA() const; + void Open( const String& rFileName, StreamMode eOpenMode ); + void Close(); + void ReOpen(); // Aufruf nach Close, FilePointer == 0 + sal_Bool IsOpen() const { return bIsOpen; } + sal_Bool IsLocked() const { return ( nLockCounter!=0 ); } + virtual sal_uInt16 IsA() const; - const String& GetFileName() const { return aFilename; } + const String& GetFileName() const { return aFilename; } }; // ---------------- @@ -777,59 +777,59 @@ class TOOLS_DLLPUBLIC SvMemoryStream : public SvStream sal_Size GetSize() const { return nSize; } protected: - sal_Size nSize; - sal_Size nResize; - sal_Size nPos; - sal_Size nEndOfData; - sal_uInt8* pBuf; - sal_Bool bOwnsData; - - virtual sal_Size GetData( void* pData, sal_Size nSize ); - virtual sal_Size PutData( const void* pData, sal_Size nSize ); - virtual sal_Size SeekPos( sal_Size nPos ); - virtual void SetSize( sal_Size nSize ); - virtual void FlushData(); + sal_Size nSize; + sal_Size nResize; + sal_Size nPos; + sal_Size nEndOfData; + sal_uInt8* pBuf; + sal_Bool bOwnsData; + + virtual sal_Size GetData( void* pData, sal_Size nSize ); + virtual sal_Size PutData( const void* pData, sal_Size nSize ); + virtual sal_Size SeekPos( sal_Size nPos ); + virtual void SetSize( sal_Size nSize ); + virtual void FlushData(); // AllocateMemory muss folgende Variable mitpflegen: // - pBuf: Adresse des neuen Blocks - virtual sal_Bool AllocateMemory( sal_Size nSize ); + virtual sal_Bool AllocateMemory( sal_Size nSize ); // ReAllocateMemory muss folgende Variablen mitpflegen: // - pBuf: Adresse des neuen Blocks // - nEndOfData: Muss auf nNewSize-1L gesetzt werden, wenn ausserhalb des Blocks - // Muss auf 0 gesetzt werden, wenn neuer Block 0 Byte gross + // Muss auf 0 gesetzt werden, wenn neuer Block 0 Byte gross // - nSize: Neue Groesse des Blocks // - nPos: Muss auf 0 gesetzt werden, wenn ausserhalb des Blocks - virtual sal_Bool ReAllocateMemory( long nDiff ); + virtual sal_Bool ReAllocateMemory( long nDiff ); // wird aufgerufen, wenn dem Stream der Speicher gehoert oder wenn // der Speicher in der Groesse veraendert wird. // FreeMemory muss folgende Variablen mitpflegen: // - in abgeleiteten Klassen muessen ggf. Handles genullt werden - virtual void FreeMemory(); + virtual void FreeMemory(); - SvMemoryStream(void*) { } // Fuer unsere Subklassen + SvMemoryStream(void*) { } // Fuer unsere Subklassen public: SvMemoryStream( void* pBuf, sal_Size nSize, StreamMode eMode); SvMemoryStream( sal_Size nInitSize=512, sal_Size nResize=64 ); ~SvMemoryStream(); - virtual void ResetError(); + virtual void ResetError(); sal_Size GetEndOfData() const { return nEndOfData; } - const void* GetData() { Flush(); return pBuf; } - operator const void*() { Flush(); return pBuf; } - virtual sal_uInt16 IsA() const; + const void* GetData() { Flush(); return pBuf; } + operator const void*() { Flush(); return pBuf; } + virtual sal_uInt16 IsA() const; - void* SwitchBuffer( sal_Size nInitSize=512, sal_Size nResize=64 ); - void* SetBuffer( void* pBuf, sal_Size nSize, + void* SwitchBuffer( sal_Size nInitSize=512, sal_Size nResize=64 ); + void* SetBuffer( void* pBuf, sal_Size nSize, sal_Bool bOwnsData=TRUE, sal_Size nEOF=0 ); - void ObjectOwnsMemory( sal_Bool bOwn ) { bOwnsData = bOwn; } - sal_Bool IsObjectMemoryOwner() { return bOwnsData; } - void SetResizeOffset( sal_Size nNewResize ) { nResize = nNewResize; } - sal_Size GetResizeOffset() const { return nResize; } + void ObjectOwnsMemory( sal_Bool bOwn ) { bOwnsData = bOwn; } + sal_Bool IsObjectMemoryOwner() { return bOwnsData; } + void SetResizeOffset( sal_Size nNewResize ) { nResize = nNewResize; } + sal_Size GetResizeOffset() const { return nResize; } }; // -------------------- @@ -847,10 +847,10 @@ public: mehrfaches Aufrufen von Load und Assign erlaubt --------------------------------------------------*/ TYPEINFO(); - virtual ~SvDataCopyStream(){} - virtual void Load( SvStream & ) = 0; - virtual void Save( SvStream & ) = 0; - virtual void Assign( const SvDataCopyStream & ); + virtual ~SvDataCopyStream(){} + virtual void Load( SvStream & ) = 0; + virtual void Save( SvStream & ) = 0; + virtual void Assign( const SvDataCopyStream & ); }; #endif // _STREAM_HXX diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx index cd4b8227fc0a..8b86a1835596 100644 --- a/tools/inc/tools/string.hxx +++ b/tools/inc/tools/string.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,10 +61,10 @@ class UniString; // ----------------------------------------------------------------------- -#define BYTESTRING_TO_UNISTRING_CVTFLAGS (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE |\ +#define BYTESTRING_TO_UNISTRING_CVTFLAGS (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE |\ RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |\ RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT) -#define UNISTRING_TO_BYTESTRING_CVTFLAGS (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT |\ +#define UNISTRING_TO_BYTESTRING_CVTFLAGS (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT |\ RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT |\ RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE |\ RTL_UNICODETOTEXT_FLAGS_PRIVATE_MAPTO0 |\ @@ -113,14 +113,14 @@ inline LineEnd GetSystemLineEnd() #ifdef STRING32 #define STRING_NOTFOUND ((xub_StrLen)0x7FFFFFFF) -#define STRING_MATCH ((xub_StrLen)0x7FFFFFFF) -#define STRING_LEN ((xub_StrLen)0x7FFFFFFF) -#define STRING_MAXLEN ((xub_StrLen)0x7FFFFFFF) +#define STRING_MATCH ((xub_StrLen)0x7FFFFFFF) +#define STRING_LEN ((xub_StrLen)0x7FFFFFFF) +#define STRING_MAXLEN ((xub_StrLen)0x7FFFFFFF) #else #define STRING_NOTFOUND ((xub_StrLen)0xFFFF) -#define STRING_MATCH ((xub_StrLen)0xFFFF) -#define STRING_LEN ((xub_StrLen)0xFFFF) -#define STRING_MAXLEN ((xub_StrLen)0xFFFF) +#define STRING_MATCH ((xub_StrLen)0xFFFF) +#define STRING_LEN ((xub_StrLen)0xFFFF) +#define STRING_MAXLEN ((xub_StrLen)0xFFFF) #endif enum StringCompare { COMPARE_LESS = -1, COMPARE_EQUAL = 0, COMPARE_GREATER = 1 }; @@ -142,9 +142,9 @@ enum StringCompare { COMPARE_LESS = -1, COMPARE_EQUAL = 0, COMPARE_GREATER = 1 } typedef struct _ByteStringData { - sal_Int32 mnRefCount; // Referenz counter - sal_Int32 mnLen; // Length of the String - sal_Char maStr[1]; // CharArray (String) + sal_Int32 mnRefCount; // Referenz counter + sal_Int32 mnLen; // Length of the String + sal_Char maStr[1]; // CharArray (String) } ByteStringData; #ifdef SAL_W32 @@ -159,12 +159,12 @@ typedef struct _ByteStringData class TOOLS_DLLPUBLIC ByteString { - friend class UniString; + friend class UniString; TOOLS_DLLPRIVATE void InitStringRes( const UniString& rStr ); private: - ByteStringData* mpData; + ByteStringData* mpData; TOOLS_DLLPRIVATE inline void ImplCopyData(); TOOLS_DLLPRIVATE inline char * ImplCopyStringData(char *); @@ -212,186 +212,186 @@ public: return rtl::OString (reinterpret_cast<rtl_String*>(mpData)); } - static ByteString CreateFromInt32( sal_Int32 n, sal_Int16 nRadix = 10 ); - static ByteString CreateFromInt64( sal_Int64 n, sal_Int16 nRadix = 10 ); - static ByteString CreateFromFloat( float f ); - static ByteString CreateFromDouble( double d ); + static ByteString CreateFromInt32( sal_Int32 n, sal_Int16 nRadix = 10 ); + static ByteString CreateFromInt64( sal_Int64 n, sal_Int16 nRadix = 10 ); + static ByteString CreateFromFloat( float f ); + static ByteString CreateFromDouble( double d ); static const ByteString& EmptyString(); - sal_Int32 ToInt32() const; - sal_Int64 ToInt64() const; - float ToFloat() const; - double ToDouble() const; - - ByteString& Assign( const ByteString& rStr ); - ByteString& Assign( const rtl::OString& rStr ); - ByteString& Assign( const sal_Char* pCharStr ); - ByteString& Assign( const sal_Char* pCharStr, xub_StrLen nLen ); - ByteString& Assign( sal_Char c ); - ByteString& operator =( const ByteString& rStr ) + sal_Int32 ToInt32() const; + sal_Int64 ToInt64() const; + float ToFloat() const; + double ToDouble() const; + + ByteString& Assign( const ByteString& rStr ); + ByteString& Assign( const rtl::OString& rStr ); + ByteString& Assign( const sal_Char* pCharStr ); + ByteString& Assign( const sal_Char* pCharStr, xub_StrLen nLen ); + ByteString& Assign( sal_Char c ); + ByteString& operator =( const ByteString& rStr ) { return Assign( rStr ); } - ByteString& operator =( const rtl::OString& rStr ) + ByteString& operator =( const rtl::OString& rStr ) { return Assign( rStr ); } - ByteString& operator =( const sal_Char* pCharStr ) + ByteString& operator =( const sal_Char* pCharStr ) { return Assign( pCharStr ); } - ByteString& operator =( const sal_Char c ) + ByteString& operator =( const sal_Char c ) { return Assign( c ); } - ByteString& Append( const ByteString& rStr ); - ByteString& Append( const sal_Char* pCharStr ); - ByteString& Append( const sal_Char* pCharStr, xub_StrLen nLen ); - ByteString& Append( char c ); - ByteString& operator +=( const ByteString& rStr ) + ByteString& Append( const ByteString& rStr ); + ByteString& Append( const sal_Char* pCharStr ); + ByteString& Append( const sal_Char* pCharStr, xub_StrLen nLen ); + ByteString& Append( char c ); + ByteString& operator +=( const ByteString& rStr ) { return Append( rStr ); } - ByteString& operator +=( const sal_Char* pCharStr ) + ByteString& operator +=( const sal_Char* pCharStr ) { return Append( pCharStr ); } - ByteString& operator +=( sal_Char c ) + ByteString& operator +=( sal_Char c ) { return Append( c ); } - void SetChar( xub_StrLen nIndex, sal_Char c ); - sal_Char GetChar( xub_StrLen nIndex ) const + void SetChar( xub_StrLen nIndex, sal_Char c ); + sal_Char GetChar( xub_StrLen nIndex ) const { return mpData->maStr[nIndex]; } - xub_StrLen Len() const { return (xub_StrLen)mpData->mnLen; } + xub_StrLen Len() const { return (xub_StrLen)mpData->mnLen; } - ByteString& Insert( const ByteString& rStr, xub_StrLen nIndex = STRING_LEN ); - ByteString& Insert( const ByteString& rStr, xub_StrLen nPos, xub_StrLen nLen, + ByteString& Insert( const ByteString& rStr, xub_StrLen nIndex = STRING_LEN ); + ByteString& Insert( const ByteString& rStr, xub_StrLen nPos, xub_StrLen nLen, xub_StrLen nIndex = STRING_LEN ); - ByteString& Insert( const sal_Char* pCharStr, xub_StrLen nIndex = STRING_LEN ); - ByteString& Insert( sal_Char c, xub_StrLen nIndex = STRING_LEN ); - ByteString& Replace( xub_StrLen nIndex, xub_StrLen nCount, const ByteString& rStr ); - ByteString& Erase( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN ); + ByteString& Insert( const sal_Char* pCharStr, xub_StrLen nIndex = STRING_LEN ); + ByteString& Insert( sal_Char c, xub_StrLen nIndex = STRING_LEN ); + ByteString& Replace( xub_StrLen nIndex, xub_StrLen nCount, const ByteString& rStr ); + ByteString& Erase( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN ); ByteString Copy( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN ) const; - ByteString& Fill( xub_StrLen nCount, sal_Char cFillChar = ' ' ); - ByteString& Expand( xub_StrLen nCount, sal_Char cExpandChar = ' ' ); + ByteString& Fill( xub_StrLen nCount, sal_Char cFillChar = ' ' ); + ByteString& Expand( xub_StrLen nCount, sal_Char cExpandChar = ' ' ); - ByteString& EraseLeadingChars( sal_Char c = ' ' ); - ByteString& EraseTrailingChars( sal_Char c = ' ' ); - ByteString& EraseLeadingAndTrailingChars( sal_Char c = ' ' ); - ByteString& EraseAllChars( sal_Char c = ' ' ); - ByteString& Reverse(); + ByteString& EraseLeadingChars( sal_Char c = ' ' ); + ByteString& EraseTrailingChars( sal_Char c = ' ' ); + ByteString& EraseLeadingAndTrailingChars( sal_Char c = ' ' ); + ByteString& EraseAllChars( sal_Char c = ' ' ); + ByteString& Reverse(); - ByteString& Convert( rtl_TextEncoding eSource, + ByteString& Convert( rtl_TextEncoding eSource, rtl_TextEncoding eTarget, BOOL bReplace = TRUE ); - static sal_Char Convert( sal_Char c, rtl_TextEncoding eSource, + static sal_Char Convert( sal_Char c, rtl_TextEncoding eSource, rtl_TextEncoding eTarget, BOOL bReplace = TRUE ); - static sal_Unicode ConvertToUnicode( sal_Char c, + static sal_Unicode ConvertToUnicode( sal_Char c, rtl_TextEncoding eTextEncoding ); - static sal_Char ConvertFromUnicode( sal_Unicode c, + static sal_Char ConvertFromUnicode( sal_Unicode c, rtl_TextEncoding eTextEncoding, BOOL bReplace = TRUE ); - static sal_Unicode ConvertToUnicode( const sal_Char* pChar, sal_Size* pLen, + static sal_Unicode ConvertToUnicode( const sal_Char* pChar, sal_Size* pLen, rtl_TextEncoding eTextEncoding ); - static sal_Size ConvertFromUnicode( sal_Unicode c, sal_Char* pBuf, sal_Size nBufLen, + static sal_Size ConvertFromUnicode( sal_Unicode c, sal_Char* pBuf, sal_Size nBufLen, rtl_TextEncoding eTextEncoding, BOOL bReplace = TRUE ); - ByteString& ConvertLineEnd( LineEnd eLineEnd ); - ByteString& ConvertLineEnd() + ByteString& ConvertLineEnd( LineEnd eLineEnd ); + ByteString& ConvertLineEnd() { return ConvertLineEnd( GetSystemLineEnd() ); } - BOOL IsLowerAscii() const; - BOOL IsUpperAscii() const; - BOOL IsAlphaAscii() const; - BOOL IsNumericAscii() const; - BOOL IsAlphaNumericAscii() const; + BOOL IsLowerAscii() const; + BOOL IsUpperAscii() const; + BOOL IsAlphaAscii() const; + BOOL IsNumericAscii() const; + BOOL IsAlphaNumericAscii() const; - ByteString& ToLowerAscii(); - ByteString& ToUpperAscii(); + ByteString& ToLowerAscii(); + ByteString& ToUpperAscii(); - StringCompare CompareTo( const ByteString& rStr, + StringCompare CompareTo( const ByteString& rStr, xub_StrLen nLen = STRING_LEN ) const; - StringCompare CompareTo( const sal_Char* pCharStr, + StringCompare CompareTo( const sal_Char* pCharStr, xub_StrLen nLen = STRING_LEN ) const; - StringCompare CompareIgnoreCaseToAscii( const ByteString& rStr, + StringCompare CompareIgnoreCaseToAscii( const ByteString& rStr, xub_StrLen nLen = STRING_LEN ) const; - StringCompare CompareIgnoreCaseToAscii( const sal_Char* pCharStr, + StringCompare CompareIgnoreCaseToAscii( const sal_Char* pCharStr, xub_StrLen nLen = STRING_LEN ) const; - BOOL Equals( const ByteString& rStr ) const; - BOOL Equals( const sal_Char* pCharStr ) const; - BOOL EqualsIgnoreCaseAscii( const ByteString& rStr ) const; - BOOL EqualsIgnoreCaseAscii( const sal_Char* pCharStr ) const; - BOOL Equals( const ByteString& rStr, + BOOL Equals( const ByteString& rStr ) const; + BOOL Equals( const sal_Char* pCharStr ) const; + BOOL EqualsIgnoreCaseAscii( const ByteString& rStr ) const; + BOOL EqualsIgnoreCaseAscii( const sal_Char* pCharStr ) const; + BOOL Equals( const ByteString& rStr, xub_StrLen nIndex, xub_StrLen nLen ) const; - BOOL Equals( const sal_Char* pCharStr, + BOOL Equals( const sal_Char* pCharStr, xub_StrLen nIndex, xub_StrLen nLen ) const; - BOOL EqualsIgnoreCaseAscii( const ByteString& rStr, + BOOL EqualsIgnoreCaseAscii( const ByteString& rStr, xub_StrLen nIndex, xub_StrLen nLen ) const; - BOOL EqualsIgnoreCaseAscii( const sal_Char* pCharStr, + BOOL EqualsIgnoreCaseAscii( const sal_Char* pCharStr, xub_StrLen nIndex, xub_StrLen nLen ) const; - xub_StrLen Match( const ByteString& rStr ) const; - xub_StrLen Match( const sal_Char* pCharStr ) const; + xub_StrLen Match( const ByteString& rStr ) const; + xub_StrLen Match( const sal_Char* pCharStr ) const; - xub_StrLen Search( sal_Char c, xub_StrLen nIndex = 0 ) const; - xub_StrLen Search( const ByteString& rStr, xub_StrLen nIndex = 0 ) const; - xub_StrLen Search( const sal_Char* pCharStr, xub_StrLen nIndex = 0 ) const; - xub_StrLen SearchBackward( sal_Char c, xub_StrLen nIndex = STRING_LEN ) const; - xub_StrLen SearchChar( const sal_Char* pChars, xub_StrLen nIndex = 0 ) const; - xub_StrLen SearchCharBackward( const sal_Char* pChars, xub_StrLen nIndex = STRING_LEN ) const; + xub_StrLen Search( sal_Char c, xub_StrLen nIndex = 0 ) const; + xub_StrLen Search( const ByteString& rStr, xub_StrLen nIndex = 0 ) const; + xub_StrLen Search( const sal_Char* pCharStr, xub_StrLen nIndex = 0 ) const; + xub_StrLen SearchBackward( sal_Char c, xub_StrLen nIndex = STRING_LEN ) const; + xub_StrLen SearchChar( const sal_Char* pChars, xub_StrLen nIndex = 0 ) const; + xub_StrLen SearchCharBackward( const sal_Char* pChars, xub_StrLen nIndex = STRING_LEN ) const; - xub_StrLen SearchAndReplace( sal_Char c, sal_Char cRep, xub_StrLen nIndex = 0 ); - xub_StrLen SearchAndReplace( const ByteString& rStr, const ByteString& rRepStr, + xub_StrLen SearchAndReplace( sal_Char c, sal_Char cRep, xub_StrLen nIndex = 0 ); + xub_StrLen SearchAndReplace( const ByteString& rStr, const ByteString& rRepStr, xub_StrLen nIndex = 0 ); - xub_StrLen SearchAndReplace( const sal_Char* pCharStr, const ByteString& rRepStr, + xub_StrLen SearchAndReplace( const sal_Char* pCharStr, const ByteString& rRepStr, xub_StrLen nIndex = 0 ); - void SearchAndReplaceAll( sal_Char c, sal_Char cRep ); - void SearchAndReplaceAll( const ByteString& rStr, const ByteString& rRepStr ); - void SearchAndReplaceAll( const sal_Char* pCharStr, const ByteString& rRepStr ); + void SearchAndReplaceAll( sal_Char c, sal_Char cRep ); + void SearchAndReplaceAll( const ByteString& rStr, const ByteString& rRepStr ); + void SearchAndReplaceAll( const sal_Char* pCharStr, const ByteString& rRepStr ); - xub_StrLen GetTokenCount( sal_Char cTok = ';' ) const; - void SetToken( xub_StrLen nToken, sal_Char cTok, const ByteString& rStr, + xub_StrLen GetTokenCount( sal_Char cTok = ';' ) const; + void SetToken( xub_StrLen nToken, sal_Char cTok, const ByteString& rStr, xub_StrLen nIndex = 0 ); - ByteString GetToken( xub_StrLen nToken, sal_Char cTok, xub_StrLen& rIndex ) const; - ByteString GetToken( xub_StrLen nToken, sal_Char cTok = ';' ) const; + ByteString GetToken( xub_StrLen nToken, sal_Char cTok, xub_StrLen& rIndex ) const; + ByteString GetToken( xub_StrLen nToken, sal_Char cTok = ';' ) const; - xub_StrLen GetQuotedTokenCount( const ByteString& rQuotedPairs, sal_Char cTok = ';' ) const; - ByteString GetQuotedToken( xub_StrLen nToken, const ByteString& rQuotedPairs, - sal_Char cTok, xub_StrLen& rIndex ) const; - ByteString GetQuotedToken( xub_StrLen nToken, const ByteString& rQuotedPairs, + xub_StrLen GetQuotedTokenCount( const ByteString& rQuotedPairs, sal_Char cTok = ';' ) const; + ByteString GetQuotedToken( xub_StrLen nToken, const ByteString& rQuotedPairs, + sal_Char cTok, xub_StrLen& rIndex ) const; + ByteString GetQuotedToken( xub_StrLen nToken, const ByteString& rQuotedPairs, sal_Char cTok = ';' ) const; - const sal_Char* GetBuffer() const { return mpData->maStr; } - sal_Char* GetBufferAccess(); - void ReleaseBufferAccess( xub_StrLen nLen = STRING_LEN ); - sal_Char* AllocBuffer( xub_StrLen nLen ); + const sal_Char* GetBuffer() const { return mpData->maStr; } + sal_Char* GetBufferAccess(); + void ReleaseBufferAccess( xub_StrLen nLen = STRING_LEN ); + sal_Char* AllocBuffer( xub_StrLen nLen ); - friend BOOL operator == ( const ByteString& rStr1, const ByteString& rStr2 ) + friend BOOL operator == ( const ByteString& rStr1, const ByteString& rStr2 ) { return rStr1.Equals( rStr2 ); } - friend BOOL operator == ( const ByteString& rStr, const sal_Char* pCharStr ) + friend BOOL operator == ( const ByteString& rStr, const sal_Char* pCharStr ) { return rStr.Equals( pCharStr ); } - friend BOOL operator == ( const sal_Char* pCharStr, const ByteString& rStr ) + friend BOOL operator == ( const sal_Char* pCharStr, const ByteString& rStr ) { return rStr.Equals( pCharStr ); } - friend BOOL operator != ( const ByteString& rStr1, const ByteString& rStr2 ) + friend BOOL operator != ( const ByteString& rStr1, const ByteString& rStr2 ) { return !(operator == ( rStr1, rStr2 )); } - friend BOOL operator != ( const ByteString& rStr, const sal_Char* pCharStr ) + friend BOOL operator != ( const ByteString& rStr, const sal_Char* pCharStr ) { return !(operator == ( rStr, pCharStr )); } - friend BOOL operator != ( const sal_Char* pCharStr, const ByteString& rStr ) + friend BOOL operator != ( const sal_Char* pCharStr, const ByteString& rStr ) { return !(operator == ( pCharStr, rStr )); } - friend BOOL operator < ( const ByteString& rStr1, const ByteString& rStr2 ) + friend BOOL operator < ( const ByteString& rStr1, const ByteString& rStr2 ) { return (rStr1.CompareTo( rStr2 ) == COMPARE_LESS); } - friend BOOL operator < ( const ByteString& rStr, const sal_Char* pCharStr ) + friend BOOL operator < ( const ByteString& rStr, const sal_Char* pCharStr ) { return (rStr.CompareTo( pCharStr ) == COMPARE_LESS); } - friend BOOL operator < ( const sal_Char* pCharStr, const ByteString& rStr ) + friend BOOL operator < ( const sal_Char* pCharStr, const ByteString& rStr ) { return (rStr.CompareTo( pCharStr ) >= COMPARE_EQUAL); } - friend BOOL operator > ( const ByteString& rStr1, const ByteString& rStr2 ) + friend BOOL operator > ( const ByteString& rStr1, const ByteString& rStr2 ) { return (rStr1.CompareTo( rStr2 ) == COMPARE_GREATER); } - friend BOOL operator > ( const ByteString& rStr, const sal_Char* pCharStr ) + friend BOOL operator > ( const ByteString& rStr, const sal_Char* pCharStr ) { return (rStr.CompareTo( pCharStr ) == COMPARE_GREATER); } - friend BOOL operator > ( const sal_Char* pCharStr, const ByteString& rStr ) + friend BOOL operator > ( const sal_Char* pCharStr, const ByteString& rStr ) { return (rStr.CompareTo( pCharStr ) <= COMPARE_EQUAL); } - friend BOOL operator <= ( const ByteString& rStr1, const ByteString& rStr2 ) + friend BOOL operator <= ( const ByteString& rStr1, const ByteString& rStr2 ) { return !(operator > ( rStr1, rStr2 )); } - friend BOOL operator <= ( const ByteString& rStr, const sal_Char* pCharStr ) + friend BOOL operator <= ( const ByteString& rStr, const sal_Char* pCharStr ) { return !(operator > ( rStr, pCharStr )); } - friend BOOL operator <= ( const sal_Char* pCharStr, const ByteString& rStr ) + friend BOOL operator <= ( const sal_Char* pCharStr, const ByteString& rStr ) { return !(operator > ( pCharStr, rStr )); } - friend BOOL operator >= ( const ByteString& rStr1, const ByteString& rStr2 ) + friend BOOL operator >= ( const ByteString& rStr1, const ByteString& rStr2 ) { return !(operator < ( rStr1, rStr2 )); } - friend BOOL operator >= ( const ByteString& rStr, const sal_Char* pCharStr ) + friend BOOL operator >= ( const ByteString& rStr, const sal_Char* pCharStr ) { return !(operator < ( rStr, pCharStr )); } - friend BOOL operator >= ( const sal_Char* pCharStr, const ByteString& rStr ) + friend BOOL operator >= ( const sal_Char* pCharStr, const ByteString& rStr ) { return !(operator < ( pCharStr, rStr )); } }; @@ -430,9 +430,9 @@ inline ByteString ByteString::GetQuotedToken( xub_StrLen nToken, const ByteStrin typedef struct _UniStringData { - sal_Int32 mnRefCount; // Referenz counter - sal_Int32 mnLen; // Length of the String - sal_Unicode maStr[1]; // CharArray (String) + sal_Int32 mnRefCount; // Referenz counter + sal_Int32 mnLen; // Length of the String + sal_Unicode maStr[1]; // CharArray (String) } UniStringData; #ifdef SAL_W32 @@ -446,7 +446,7 @@ typedef struct _UniStringData // ------------------- #ifndef NOOLDSTRING -#define WSTRING_MAXLEN STRING_MAXLEN +#define WSTRING_MAXLEN STRING_MAXLEN #endif // ------------- @@ -455,12 +455,12 @@ typedef struct _UniStringData class TOOLS_DLLPUBLIC UniString { - friend class ByteString; + friend class ByteString; TOOLS_DLLPRIVATE void InitStringRes( const sal_Char* pUTF8Str, sal_Int32 nLen ); private: - UniStringData* mpData; + UniStringData* mpData; TOOLS_DLLPRIVATE inline void ImplCopyData(); TOOLS_DLLPRIVATE inline sal_Unicode * ImplCopyStringData(sal_Unicode *); @@ -508,173 +508,173 @@ public: UniString intern() const; - static UniString CreateFromAscii( const sal_Char* pAsciiStr ); - static UniString CreateFromAscii( const sal_Char* pAsciiStr, xub_StrLen nLen ); + static UniString CreateFromAscii( const sal_Char* pAsciiStr ); + static UniString CreateFromAscii( const sal_Char* pAsciiStr, xub_StrLen nLen ); - static UniString CreateFromInt32( sal_Int32 n, sal_Int16 nRadix = 10 ); - static UniString CreateFromInt64( sal_Int64 n, sal_Int16 nRadix = 10 ); - static UniString CreateFromFloat( float f ); - static UniString CreateFromDouble( double d ); + static UniString CreateFromInt32( sal_Int32 n, sal_Int16 nRadix = 10 ); + static UniString CreateFromInt64( sal_Int64 n, sal_Int16 nRadix = 10 ); + static UniString CreateFromFloat( float f ); + static UniString CreateFromDouble( double d ); static const UniString& EmptyString(); - sal_Int32 ToInt32() const; - sal_Int64 ToInt64() const; - float ToFloat() const; - double ToDouble() const; - - UniString& Assign( const UniString& rStr ); - UniString& Assign( const rtl::OUString& rStr ); - UniString& Assign( const sal_Unicode* pCharStr ); - UniString& Assign( const sal_Unicode* pCharStr, xub_StrLen nLen ); - UniString& Assign( sal_Unicode c ); + sal_Int32 ToInt32() const; + sal_Int64 ToInt64() const; + float ToFloat() const; + double ToDouble() const; + + UniString& Assign( const UniString& rStr ); + UniString& Assign( const rtl::OUString& rStr ); + UniString& Assign( const sal_Unicode* pCharStr ); + UniString& Assign( const sal_Unicode* pCharStr, xub_StrLen nLen ); + UniString& Assign( sal_Unicode c ); inline UniString & Assign(char c) // ...but allow "Assign('a')" { return Assign(static_cast< sal_Unicode >(c)); } - UniString& AssignAscii( const sal_Char* pAsciiStr ); - UniString& AssignAscii( const sal_Char* pAsciiStr, xub_StrLen nLen ); - UniString& operator =( const UniString& rStr ) + UniString& AssignAscii( const sal_Char* pAsciiStr ); + UniString& AssignAscii( const sal_Char* pAsciiStr, xub_StrLen nLen ); + UniString& operator =( const UniString& rStr ) { return Assign( rStr ); } - UniString& operator =( const rtl::OUString& rStr ) + UniString& operator =( const rtl::OUString& rStr ) { return Assign( rStr ); } - UniString& operator =( const sal_Unicode* pCharStr ) + UniString& operator =( const sal_Unicode* pCharStr ) { return Assign( pCharStr ); } - UniString& operator =( sal_Unicode c ) + UniString& operator =( sal_Unicode c ) { return Assign( c ); } inline UniString & operator =(char c) // ...but allow "= 'a'" { return operator =(static_cast< sal_Unicode >(c)); } - UniString& Append( const UniString& rStr ); - UniString& Append( const sal_Unicode* pCharStr ); - UniString& Append( const sal_Unicode* pCharStr, xub_StrLen nLen ); - UniString& Append( sal_Unicode c ); + UniString& Append( const UniString& rStr ); + UniString& Append( const sal_Unicode* pCharStr ); + UniString& Append( const sal_Unicode* pCharStr, xub_StrLen nLen ); + UniString& Append( sal_Unicode c ); inline UniString & Append(char c) // ...but allow "Append('a')" { return Append(static_cast< sal_Unicode >(c)); } - UniString& AppendAscii( const sal_Char* pAsciiStr ); - UniString& AppendAscii( const sal_Char* pAsciiStr, xub_StrLen nLen ); - UniString& operator +=( const UniString& rStr ) + UniString& AppendAscii( const sal_Char* pAsciiStr ); + UniString& AppendAscii( const sal_Char* pAsciiStr, xub_StrLen nLen ); + UniString& operator +=( const UniString& rStr ) { return Append( rStr ); } - UniString& operator +=( const sal_Unicode* pCharStr ) + UniString& operator +=( const sal_Unicode* pCharStr ) { return Append( pCharStr ); } - UniString& operator +=( sal_Unicode c ) + UniString& operator +=( sal_Unicode c ) { return Append( c ); } inline UniString & operator +=(char c) // ...but allow "+= 'a'" { return operator +=(static_cast< sal_Unicode >(c)); } - void SetChar( xub_StrLen nIndex, sal_Unicode c ); - sal_Unicode GetChar( xub_StrLen nIndex ) const + void SetChar( xub_StrLen nIndex, sal_Unicode c ); + sal_Unicode GetChar( xub_StrLen nIndex ) const { return mpData->maStr[nIndex]; } - xub_StrLen Len() const { return (xub_StrLen)mpData->mnLen; } + xub_StrLen Len() const { return (xub_StrLen)mpData->mnLen; } - UniString& Insert( const UniString& rStr, xub_StrLen nIndex = STRING_LEN ); - UniString& Insert( const UniString& rStr, xub_StrLen nPos, xub_StrLen nLen, + UniString& Insert( const UniString& rStr, xub_StrLen nIndex = STRING_LEN ); + UniString& Insert( const UniString& rStr, xub_StrLen nPos, xub_StrLen nLen, xub_StrLen nIndex = STRING_LEN ); - UniString& Insert( const sal_Unicode* pCharStr, xub_StrLen nIndex = STRING_LEN ); - UniString& Insert( sal_Unicode c, xub_StrLen nIndex = STRING_LEN ); - UniString& InsertAscii( const sal_Char* pAsciiStr, xub_StrLen nIndex = STRING_LEN ); - UniString& Replace( xub_StrLen nIndex, xub_StrLen nLen, const UniString& rStr ); - UniString& ReplaceAscii( xub_StrLen nIndex, xub_StrLen nLen, + UniString& Insert( const sal_Unicode* pCharStr, xub_StrLen nIndex = STRING_LEN ); + UniString& Insert( sal_Unicode c, xub_StrLen nIndex = STRING_LEN ); + UniString& InsertAscii( const sal_Char* pAsciiStr, xub_StrLen nIndex = STRING_LEN ); + UniString& Replace( xub_StrLen nIndex, xub_StrLen nLen, const UniString& rStr ); + UniString& ReplaceAscii( xub_StrLen nIndex, xub_StrLen nLen, const sal_Char* pAsciiStr, xub_StrLen nStrLen = STRING_LEN ); - UniString& Erase( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN ); + UniString& Erase( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN ); UniString Copy( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN ) const; - UniString& Fill( xub_StrLen nCount, sal_Unicode cFillChar = ' ' ); - UniString& Expand( xub_StrLen nCount, sal_Unicode cExpandChar = ' ' ); + UniString& Fill( xub_StrLen nCount, sal_Unicode cFillChar = ' ' ); + UniString& Expand( xub_StrLen nCount, sal_Unicode cExpandChar = ' ' ); - UniString& EraseLeadingChars( sal_Unicode c = ' ' ); - UniString& EraseTrailingChars( sal_Unicode c = ' ' ); - UniString& EraseLeadingAndTrailingChars( sal_Unicode c = ' ' ); - UniString& EraseAllChars( sal_Unicode c = ' ' ); - UniString& Reverse(); + UniString& EraseLeadingChars( sal_Unicode c = ' ' ); + UniString& EraseTrailingChars( sal_Unicode c = ' ' ); + UniString& EraseLeadingAndTrailingChars( sal_Unicode c = ' ' ); + UniString& EraseAllChars( sal_Unicode c = ' ' ); + UniString& Reverse(); - UniString& ConvertLineEnd( LineEnd eLineEnd ); - UniString& ConvertLineEnd() + UniString& ConvertLineEnd( LineEnd eLineEnd ); + UniString& ConvertLineEnd() { return ConvertLineEnd( GetSystemLineEnd() ); } - UniString& ToLowerAscii(); - UniString& ToUpperAscii(); + UniString& ToLowerAscii(); + UniString& ToUpperAscii(); - StringCompare CompareTo( const UniString& rStr, + StringCompare CompareTo( const UniString& rStr, xub_StrLen nLen = STRING_LEN ) const; - StringCompare CompareTo( const sal_Unicode* pCharStr, + StringCompare CompareTo( const sal_Unicode* pCharStr, xub_StrLen nLen = STRING_LEN ) const; - StringCompare CompareToAscii( const sal_Char* pAsciiStr, + StringCompare CompareToAscii( const sal_Char* pAsciiStr, xub_StrLen nLen = STRING_LEN ) const; - StringCompare CompareIgnoreCaseToAscii( const UniString& rStr, + StringCompare CompareIgnoreCaseToAscii( const UniString& rStr, xub_StrLen nLen = STRING_LEN ) const; - StringCompare CompareIgnoreCaseToAscii( const sal_Unicode* pCharStr, + StringCompare CompareIgnoreCaseToAscii( const sal_Unicode* pCharStr, xub_StrLen nLen = STRING_LEN ) const; - StringCompare CompareIgnoreCaseToAscii( const sal_Char* pAsciiStr, + StringCompare CompareIgnoreCaseToAscii( const sal_Char* pAsciiStr, xub_StrLen nLen = STRING_LEN ) const; - BOOL Equals( const UniString& rStr ) const; - BOOL Equals( const sal_Unicode* pCharStr ) const; - BOOL EqualsAscii( const sal_Char* pAsciiStr ) const; - BOOL EqualsIgnoreCaseAscii( const UniString& rStr ) const; - BOOL EqualsIgnoreCaseAscii( const sal_Unicode* pCharStr ) const; - BOOL EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr ) const; - BOOL Equals( const UniString& rStr, + BOOL Equals( const UniString& rStr ) const; + BOOL Equals( const sal_Unicode* pCharStr ) const; + BOOL EqualsAscii( const sal_Char* pAsciiStr ) const; + BOOL EqualsIgnoreCaseAscii( const UniString& rStr ) const; + BOOL EqualsIgnoreCaseAscii( const sal_Unicode* pCharStr ) const; + BOOL EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr ) const; + BOOL Equals( const UniString& rStr, xub_StrLen nIndex, xub_StrLen nLen ) const; - BOOL Equals( const sal_Unicode* pCharStr, + BOOL Equals( const sal_Unicode* pCharStr, xub_StrLen nIndex, xub_StrLen nLen ) const; - BOOL EqualsAscii( const sal_Char* pAsciiStr, + BOOL EqualsAscii( const sal_Char* pAsciiStr, xub_StrLen nIndex, xub_StrLen nLen ) const; - BOOL EqualsIgnoreCaseAscii( const UniString& rStr, + BOOL EqualsIgnoreCaseAscii( const UniString& rStr, xub_StrLen nIndex, xub_StrLen nLen ) const; - BOOL EqualsIgnoreCaseAscii( const sal_Unicode* pCharStr, + BOOL EqualsIgnoreCaseAscii( const sal_Unicode* pCharStr, xub_StrLen nIndex, xub_StrLen nLen ) const; - BOOL EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr, + BOOL EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr, xub_StrLen nIndex, xub_StrLen nLen ) const; - xub_StrLen Match( const UniString& rStr ) const; - xub_StrLen Match( const sal_Unicode* pCharStr ) const; + xub_StrLen Match( const UniString& rStr ) const; + xub_StrLen Match( const sal_Unicode* pCharStr ) const; - xub_StrLen Search( sal_Unicode c, xub_StrLen nIndex = 0 ) const; - xub_StrLen Search( const UniString& rStr, xub_StrLen nIndex = 0 ) const; - xub_StrLen Search( const sal_Unicode* pCharStr, xub_StrLen nIndex = 0 ) const; - xub_StrLen SearchAscii( const sal_Char* pAsciiStr, xub_StrLen nIndex = 0 ) const; - xub_StrLen SearchBackward( sal_Unicode c, xub_StrLen nIndex = STRING_LEN ) const; - xub_StrLen SearchChar( const sal_Unicode* pChars, xub_StrLen nIndex = 0 ) const; - xub_StrLen SearchCharBackward( const sal_Unicode* pChars, xub_StrLen nIndex = STRING_LEN ) const; + xub_StrLen Search( sal_Unicode c, xub_StrLen nIndex = 0 ) const; + xub_StrLen Search( const UniString& rStr, xub_StrLen nIndex = 0 ) const; + xub_StrLen Search( const sal_Unicode* pCharStr, xub_StrLen nIndex = 0 ) const; + xub_StrLen SearchAscii( const sal_Char* pAsciiStr, xub_StrLen nIndex = 0 ) const; + xub_StrLen SearchBackward( sal_Unicode c, xub_StrLen nIndex = STRING_LEN ) const; + xub_StrLen SearchChar( const sal_Unicode* pChars, xub_StrLen nIndex = 0 ) const; + xub_StrLen SearchCharBackward( const sal_Unicode* pChars, xub_StrLen nIndex = STRING_LEN ) const; - xub_StrLen SearchAndReplace( sal_Unicode c, sal_Unicode cRep, + xub_StrLen SearchAndReplace( sal_Unicode c, sal_Unicode cRep, xub_StrLen nIndex = 0 ); - xub_StrLen SearchAndReplace( const UniString& rStr, const UniString& rRepStr, + xub_StrLen SearchAndReplace( const UniString& rStr, const UniString& rRepStr, xub_StrLen nIndex = 0 ); - xub_StrLen SearchAndReplace( const sal_Unicode* pCharStr, const UniString& rRepStr, + xub_StrLen SearchAndReplace( const sal_Unicode* pCharStr, const UniString& rRepStr, xub_StrLen nIndex = 0 ); - xub_StrLen SearchAndReplaceAscii( const sal_Char* pAsciiStr, const UniString& rRepStr, + xub_StrLen SearchAndReplaceAscii( const sal_Char* pAsciiStr, const UniString& rRepStr, xub_StrLen nIndex = 0 ); - void SearchAndReplaceAll( sal_Unicode c, sal_Unicode cRep ); - void SearchAndReplaceAll( const UniString& rStr, const UniString& rRepStr ); - void SearchAndReplaceAll( const sal_Unicode* pCharStr, const UniString& rRepStr ); - void SearchAndReplaceAllAscii( const sal_Char* pAsciiStr, const UniString& rRepStr ); + void SearchAndReplaceAll( sal_Unicode c, sal_Unicode cRep ); + void SearchAndReplaceAll( const UniString& rStr, const UniString& rRepStr ); + void SearchAndReplaceAll( const sal_Unicode* pCharStr, const UniString& rRepStr ); + void SearchAndReplaceAllAscii( const sal_Char* pAsciiStr, const UniString& rRepStr ); - xub_StrLen GetTokenCount( sal_Unicode cTok = ';' ) const; - void SetToken( xub_StrLen nToken, sal_Unicode cTok, const UniString& rStr, + xub_StrLen GetTokenCount( sal_Unicode cTok = ';' ) const; + void SetToken( xub_StrLen nToken, sal_Unicode cTok, const UniString& rStr, xub_StrLen nIndex = 0 ); - UniString GetToken( xub_StrLen nToken, sal_Unicode cTok, xub_StrLen& rIndex ) const; - UniString GetToken( xub_StrLen nToken, sal_Unicode cTok = ';' ) const; + UniString GetToken( xub_StrLen nToken, sal_Unicode cTok, xub_StrLen& rIndex ) const; + UniString GetToken( xub_StrLen nToken, sal_Unicode cTok = ';' ) const; - xub_StrLen GetQuotedTokenCount( const UniString& rQuotedPairs, sal_Unicode cTok = ';' ) const; - UniString GetQuotedToken( xub_StrLen nToken, const UniString& rQuotedPairs, + xub_StrLen GetQuotedTokenCount( const UniString& rQuotedPairs, sal_Unicode cTok = ';' ) const; + UniString GetQuotedToken( xub_StrLen nToken, const UniString& rQuotedPairs, sal_Unicode cTok, xub_StrLen& rIndex ) const; - UniString GetQuotedToken( xub_StrLen nToken, const UniString& rQuotedPairs, + UniString GetQuotedToken( xub_StrLen nToken, const UniString& rQuotedPairs, sal_Unicode cTok = ';' ) const; - const sal_Unicode* GetBuffer() const { return mpData->maStr; } - sal_Unicode* GetBufferAccess(); - void ReleaseBufferAccess( xub_StrLen nLen = STRING_LEN ); - sal_Unicode* AllocBuffer( xub_StrLen nLen ); + const sal_Unicode* GetBuffer() const { return mpData->maStr; } + sal_Unicode* GetBufferAccess(); + void ReleaseBufferAccess( xub_StrLen nLen = STRING_LEN ); + sal_Unicode* AllocBuffer( xub_StrLen nLen ); - friend BOOL operator == ( const UniString& rStr1, const UniString& rStr2 ) + friend BOOL operator == ( const UniString& rStr1, const UniString& rStr2 ) { return rStr1.Equals( rStr2 ); } - friend BOOL operator != ( const UniString& rStr1, const UniString& rStr2 ) + friend BOOL operator != ( const UniString& rStr1, const UniString& rStr2 ) { return !(operator == ( rStr1, rStr2 )); } - friend BOOL operator < ( const UniString& rStr1, const UniString& rStr2 ) + friend BOOL operator < ( const UniString& rStr1, const UniString& rStr2 ) { return (rStr1.CompareTo( rStr2 ) == COMPARE_LESS); } - friend BOOL operator > ( const UniString& rStr1, const UniString& rStr2 ) + friend BOOL operator > ( const UniString& rStr1, const UniString& rStr2 ) { return (rStr1.CompareTo( rStr2 ) == COMPARE_GREATER); } - friend BOOL operator <= ( const UniString& rStr1, const UniString& rStr2 ) + friend BOOL operator <= ( const UniString& rStr1, const UniString& rStr2 ) { return !(operator > ( rStr1, rStr2 )); } - friend BOOL operator >= ( const UniString& rStr1, const UniString& rStr2 ) + friend BOOL operator >= ( const UniString& rStr1, const UniString& rStr2 ) { return !(operator < ( rStr1, rStr2 )); } }; diff --git a/tools/inc/tools/svborder.hxx b/tools/inc/tools/svborder.hxx index da5e52dcffe8..a0509bcc89be 100644 --- a/tools/inc/tools/svborder.hxx +++ b/tools/inc/tools/svborder.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,5 +93,5 @@ TOOLS_DLLPUBLIC Rectangle & operator -= ( Rectangle & rRect, const SvBorder & rB //========================================================================= -#endif +#endif diff --git a/tools/inc/tools/svlibrary.hxx b/tools/inc/tools/svlibrary.hxx index aa0f05938464..fa8ff7c8068b 100644 --- a/tools/inc/tools/svlibrary.hxx +++ b/tools/inc/tools/svlibrary.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/svwin.h b/tools/inc/tools/svwin.h index da1ad71601fb..b4ea6fcc3374 100644 --- a/tools/inc/tools/svwin.h +++ b/tools/inc/tools/svwin.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/table.hxx b/tools/inc/tools/table.hxx index 13cd4016b68f..1ac3fbe27b6f 100644 --- a/tools/inc/tools/table.hxx +++ b/tools/inc/tools/table.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,47 +40,47 @@ class TOOLS_DLLPUBLIC Table : private Container { private: - ULONG nCount; + ULONG nCount; //#if 0 // _SOLAR__PRIVATE - TOOLS_DLLPRIVATE ULONG ImplGetIndex( ULONG nKey, ULONG* pIndex = NULL ) const; + TOOLS_DLLPRIVATE ULONG ImplGetIndex( ULONG nKey, ULONG* pIndex = NULL ) const; //#endif public: Table( USHORT nInitSize = 16, USHORT nReSize = 16 ); Table( const Table& rTable ) : Container( rTable ) { nCount = rTable.nCount; } - BOOL Insert( ULONG nKey, void* p ); - void* Remove( ULONG nKey ); - void* Replace( ULONG nKey, void* p ); - void* Get( ULONG nKey ) const; + BOOL Insert( ULONG nKey, void* p ); + void* Remove( ULONG nKey ); + void* Replace( ULONG nKey, void* p ); + void* Get( ULONG nKey ) const; - void Clear() { Container::Clear(); nCount = 0; } - ULONG Count() const { return( nCount ); } + void Clear() { Container::Clear(); nCount = 0; } + ULONG Count() const { return( nCount ); } - void* GetCurObject() const; - ULONG GetCurKey() const { return (ULONG)Container::GetCurObject(); } - ULONG GetKey( const void* p ) const; - BOOL IsKeyValid( ULONG nKey ) const; + void* GetCurObject() const; + ULONG GetCurKey() const { return (ULONG)Container::GetCurObject(); } + ULONG GetKey( const void* p ) const; + BOOL IsKeyValid( ULONG nKey ) const; - void* GetObject( ULONG nPos ) const + void* GetObject( ULONG nPos ) const { return Container::GetObject( (nPos*2)+1 ); } - ULONG GetObjectKey( ULONG nPos ) const + ULONG GetObjectKey( ULONG nPos ) const { return (ULONG)Container::GetObject( nPos*2 ); } - ULONG GetUniqueKey( ULONG nStartKey = 1 ) const; - ULONG SearchKey( ULONG nKey, ULONG* pPos = NULL ) const; + ULONG GetUniqueKey( ULONG nStartKey = 1 ) const; + ULONG SearchKey( ULONG nKey, ULONG* pPos = NULL ) const; - void* Seek( ULONG nKey ); - void* Seek( void* p ); - void* First(); - void* Last(); - void* Next(); - void* Prev(); + void* Seek( ULONG nKey ); + void* Seek( void* p ); + void* First(); + void* Last(); + void* Next(); + void* Prev(); - Table& operator =( const Table& rTable ); + Table& operator =( const Table& rTable ); - BOOL operator ==( const Table& rTable ) const + BOOL operator ==( const Table& rTable ) const { return Container::operator ==( rTable ); } - BOOL operator !=( const Table& rTable ) const + BOOL operator !=( const Table& rTable ) const { return Container::operator !=( rTable ); } }; @@ -95,58 +95,58 @@ inline Table& Table::operator =( const Table& r ) // - DECLARE_TABLE - // ----------------- -#define DECLARE_TABLE( ClassName, Type ) \ -class ClassName : private Table \ -{ \ -public: \ - using Table::Clear; \ - using Table::Count; \ - using Table::GetCurKey; \ - using Table::GetObjectKey; \ - using Table::GetUniqueKey; \ - using Table::SearchKey; \ - using Table::IsKeyValid; \ +#define DECLARE_TABLE( ClassName, Type ) \ +class ClassName : private Table \ +{ \ +public: \ + using Table::Clear; \ + using Table::Count; \ + using Table::GetCurKey; \ + using Table::GetObjectKey; \ + using Table::GetUniqueKey; \ + using Table::SearchKey; \ + using Table::IsKeyValid; \ \ - ClassName( USHORT _nInitSize = 16, \ - USHORT _nReSize = 16 ) : \ - Table( _nInitSize, _nReSize ) {} \ - ClassName( const ClassName& rClassName ) : \ - Table( rClassName ) {} \ + ClassName( USHORT _nInitSize = 16, \ + USHORT _nReSize = 16 ) : \ + Table( _nInitSize, _nReSize ) {} \ + ClassName( const ClassName& rClassName ) : \ + Table( rClassName ) {} \ \ - BOOL Insert( ULONG nKey, Type p ) \ - { return Table::Insert( nKey, (void*)p ); } \ - Type Remove( ULONG nKey ) \ - { return (Type)Table::Remove( nKey ); } \ - Type Replace( ULONG nKey, Type p ) \ - { return (Type)Table::Replace( nKey, (void*)p ); } \ - Type Get( ULONG nKey ) const \ - { return (Type)Table::Get( nKey ); } \ + BOOL Insert( ULONG nKey, Type p ) \ + { return Table::Insert( nKey, (void*)p ); } \ + Type Remove( ULONG nKey ) \ + { return (Type)Table::Remove( nKey ); } \ + Type Replace( ULONG nKey, Type p ) \ + { return (Type)Table::Replace( nKey, (void*)p ); } \ + Type Get( ULONG nKey ) const \ + { return (Type)Table::Get( nKey ); } \ \ - Type GetCurObject() const \ - { return (Type)Table::GetCurObject(); } \ - ULONG GetKey( const Type p ) const \ - { return Table::GetKey( (const void*)p ); } \ + Type GetCurObject() const \ + { return (Type)Table::GetCurObject(); } \ + ULONG GetKey( const Type p ) const \ + { return Table::GetKey( (const void*)p ); } \ \ - Type GetObject( ULONG nPos ) const \ - { return (Type)Table::GetObject( nPos ); } \ + Type GetObject( ULONG nPos ) const \ + { return (Type)Table::GetObject( nPos ); } \ \ - Type Seek( ULONG nKey ) \ - { return (Type)Table::Seek( nKey ); } \ - Type Seek( Type p ) \ - { return (Type)Table::Seek( (void*)p ); } \ - Type First() { return (Type)Table::First(); } \ - Type Last() { return (Type)Table::Last(); } \ - Type Next() { return (Type)Table::Next(); } \ - Type Prev() { return (Type)Table::Prev(); } \ + Type Seek( ULONG nKey ) \ + { return (Type)Table::Seek( nKey ); } \ + Type Seek( Type p ) \ + { return (Type)Table::Seek( (void*)p ); } \ + Type First() { return (Type)Table::First(); } \ + Type Last() { return (Type)Table::Last(); } \ + Type Next() { return (Type)Table::Next(); } \ + Type Prev() { return (Type)Table::Prev(); } \ \ - ClassName& operator =( const ClassName& rClassName ) \ - { Table::operator =( rClassName ); \ - return *this; } \ + ClassName& operator =( const ClassName& rClassName ) \ + { Table::operator =( rClassName ); \ + return *this; } \ \ - BOOL operator ==( const ClassName& rTable ) const \ - { return Table::operator ==( rTable ); } \ - BOOL operator !=( const ClassName& rTable ) const \ - { return Table::operator !=( rTable ); } \ + BOOL operator ==( const ClassName& rTable ) const \ + { return Table::operator ==( rTable ); } \ + BOOL operator !=( const ClassName& rTable ) const \ + { return Table::operator !=( rTable ); } \ }; #endif // _TOOLS_TABLE_HXX diff --git a/tools/inc/tools/tempfile.hxx b/tools/inc/tools/tempfile.hxx index 9771151df137..896fed5da0cd 100644 --- a/tools/inc/tools/tempfile.hxx +++ b/tools/inc/tools/tempfile.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/tenccvt.hxx b/tools/inc/tools/tenccvt.hxx index 98db63166003..e24c2e259022 100644 --- a/tools/inc/tools/tenccvt.hxx +++ b/tools/inc/tools/tenccvt.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/testtoolloader.hxx b/tools/inc/tools/testtoolloader.hxx index 3eaf51764e42..04431d622959 100644 --- a/tools/inc/tools/testtoolloader.hxx +++ b/tools/inc/tools/testtoolloader.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/time.hxx b/tools/inc/tools/time.hxx index 9bb80c9d3b69..269b104e57e6 100644 --- a/tools/inc/tools/time.hxx +++ b/tools/inc/tools/time.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ class ResId; class TOOLS_DLLPUBLIC Time { private: - sal_Int32 nTime; + sal_Int32 nTime; public: Time(); @@ -49,64 +49,64 @@ public: Time( ULONG nHour, ULONG nMin, ULONG nSec = 0, ULONG n100Sec = 0 ); - void SetTime( sal_Int32 nNewTime ) { nTime = nNewTime; } - sal_Int32 GetTime() const { return nTime; } + void SetTime( sal_Int32 nNewTime ) { nTime = nNewTime; } + sal_Int32 GetTime() const { return nTime; } - void SetHour( USHORT nNewHour ); - void SetMin( USHORT nNewMin ); - void SetSec( USHORT nNewSec ); - void Set100Sec( USHORT nNew100Sec ); - USHORT GetHour() const + void SetHour( USHORT nNewHour ); + void SetMin( USHORT nNewMin ); + void SetSec( USHORT nNewSec ); + void Set100Sec( USHORT nNew100Sec ); + USHORT GetHour() const { ULONG nTempTime = (nTime >= 0) ? nTime : nTime*-1; return (USHORT)(nTempTime / 1000000); } - USHORT GetMin() const + USHORT GetMin() const { ULONG nTempTime = (nTime >= 0) ? nTime : nTime*-1; return (USHORT)((nTempTime / 10000) % 100); } - USHORT GetSec() const + USHORT GetSec() const { ULONG nTempTime = (nTime >= 0) ? nTime : nTime*-1; return (USHORT)((nTempTime / 100) % 100); } - USHORT Get100Sec() const + USHORT Get100Sec() const { ULONG nTempTime = (nTime >= 0) ? nTime : nTime*-1; return (USHORT)(nTempTime % 100); } - sal_Int32 GetMSFromTime() const; - void MakeTimeFromMS( sal_Int32 nMS ); + sal_Int32 GetMSFromTime() const; + void MakeTimeFromMS( sal_Int32 nMS ); /// 12 hours == 0.5 days double GetTimeInDays() const; - BOOL IsBetween( const Time& rFrom, const Time& rTo ) const + BOOL IsBetween( const Time& rFrom, const Time& rTo ) const { return ((nTime >= rFrom.nTime) && (nTime <= rTo.nTime)); } BOOL IsEqualIgnore100Sec( const Time& rTime ) const; - BOOL operator ==( const Time& rTime ) const + BOOL operator ==( const Time& rTime ) const { return (nTime == rTime.nTime); } - BOOL operator !=( const Time& rTime ) const + BOOL operator !=( const Time& rTime ) const { return (nTime != rTime.nTime); } - BOOL operator >( const Time& rTime ) const + BOOL operator >( const Time& rTime ) const { return (nTime > rTime.nTime); } - BOOL operator <( const Time& rTime ) const + BOOL operator <( const Time& rTime ) const { return (nTime < rTime.nTime); } - BOOL operator >=( const Time& rTime ) const + BOOL operator >=( const Time& rTime ) const { return (nTime >= rTime.nTime); } - BOOL operator <=( const Time& rTime ) const + BOOL operator <=( const Time& rTime ) const { return (nTime <= rTime.nTime); } - static Time GetUTCOffset(); - static ULONG GetSystemTicks(); // Elapsed time - static ULONG GetProcessTicks(); // CPU time + static Time GetUTCOffset(); + static ULONG GetSystemTicks(); // Elapsed time + static ULONG GetProcessTicks(); // CPU time - void ConvertToUTC() { *this -= Time::GetUTCOffset(); } - void ConvertToLocalTime() { *this += Time::GetUTCOffset(); } + void ConvertToUTC() { *this -= Time::GetUTCOffset(); } + void ConvertToLocalTime() { *this += Time::GetUTCOffset(); } - Time& operator =( const Time& rTime ); - Time operator -() const + Time& operator =( const Time& rTime ); + Time operator -() const { return Time( nTime * -1 ); } - Time& operator +=( const Time& rTime ); - Time& operator -=( const Time& rTime ); - TOOLS_DLLPUBLIC friend Time operator +( const Time& rTime1, const Time& rTime2 ); - TOOLS_DLLPUBLIC friend Time operator -( const Time& rTime1, const Time& rTime2 ); + Time& operator +=( const Time& rTime ); + Time& operator -=( const Time& rTime ); + TOOLS_DLLPUBLIC friend Time operator +( const Time& rTime1, const Time& rTime2 ); + TOOLS_DLLPUBLIC friend Time operator -( const Time& rTime1, const Time& rTime2 ); }; #endif // _TOOLS_TIME_HXX diff --git a/tools/inc/tools/tools.h b/tools/inc/tools/tools.h index 0e2c35752116..e1ad470cf620 100644 --- a/tools/inc/tools/tools.h +++ b/tools/inc/tools/tools.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/toolsdllapi.h b/tools/inc/tools/toolsdllapi.h index 4bacafc16529..fbd41130a145 100644 --- a/tools/inc/tools/toolsdllapi.h +++ b/tools/inc/tools/toolsdllapi.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,15 +27,15 @@ #ifndef INCLUDED_TOOLSDLLAPI_H #define INCLUDED_TOOLSDLLAPI_H - + #include "sal/types.h" - + #if defined(TOOLS_DLLIMPLEMENTATION) #define TOOLS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else #define TOOLS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define TOOLS_DLLPRIVATE SAL_DLLPRIVATE - + #endif /* INCLUDED_TOOLSDLLAPI_H */ diff --git a/tools/inc/tools/unqid.hxx b/tools/inc/tools/unqid.hxx index 102775175cd7..4e255e0efdd1 100644 --- a/tools/inc/tools/unqid.hxx +++ b/tools/inc/tools/unqid.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/unqidx.hxx b/tools/inc/tools/unqidx.hxx index 8c4c06039688..95aac95d9cf4 100644 --- a/tools/inc/tools/unqidx.hxx +++ b/tools/inc/tools/unqidx.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,7 +99,7 @@ inline void UniqueIndex::Clear() class ClassName : private UniqueIndex \ { \ public: \ - using UniqueIndex::Clear; \ + using UniqueIndex::Clear; \ using UniqueIndex::Count; \ using UniqueIndex::GetCurIndex; \ using UniqueIndex::IsIndexValid; \ diff --git a/tools/inc/tools/urlkeys.hxx b/tools/inc/tools/urlkeys.hxx index 722e5a716679..28122657b7d4 100644 --- a/tools/inc/tools/urlkeys.hxx +++ b/tools/inc/tools/urlkeys.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,46 +32,46 @@ // ANSI version -#define A_URLSECTION_SHORTCUT "InternetShortcut" -#define A_URLKEY_URL "URL" -#define A_URLKEY_TITLE "Title" -#define A_URLKEY_TARGET "Target" -#define A_URLKEY_FRAME "Frame" -#define A_URLKEY_OPENAS "OpenAs" -#define A_URLKEY_SOICON "SOIcon" -#define A_URLKEY_WIN_ICONFILE "IconFile" -#define A_URLKEY_WIN_ICONINDEX "IconIndex" -#define A_URLKEY_WORKDIR "WorkingDirectory" -#define A_URLKEY_ARGUMENTS "Arguments" -#define A_URLKEY_INTERN_ORIGURL "[URL]" +#define A_URLSECTION_SHORTCUT "InternetShortcut" +#define A_URLKEY_URL "URL" +#define A_URLKEY_TITLE "Title" +#define A_URLKEY_TARGET "Target" +#define A_URLKEY_FRAME "Frame" +#define A_URLKEY_OPENAS "OpenAs" +#define A_URLKEY_SOICON "SOIcon" +#define A_URLKEY_WIN_ICONFILE "IconFile" +#define A_URLKEY_WIN_ICONINDEX "IconIndex" +#define A_URLKEY_WORKDIR "WorkingDirectory" +#define A_URLKEY_ARGUMENTS "Arguments" +#define A_URLKEY_INTERN_ORIGURL "[URL]" // Unicode version -#define U_URLSECTION_SHORTCUT L"InternetShortcut" -#define U_URLKEY_URL L"URL" -#define U_URLKEY_TITLE L"Title" -#define U_URLKEY_TARGET L"Target" -#define U_URLKEY_FRAME L"Frame" -#define U_URLKEY_OPENAS L"OpenAs" -#define U_URLKEY_SOICON L"SOIcon" -#define U_URLKEY_WIN_ICONFILE L"IconFile" -#define U_URLKEY_WIN_ICONINDEX L"IconIndex" -#define U_URLKEY_WORKDIR L"WorkingDirectory" -#define U_URLKEY_ARGUMENTS L"Arguments" -#define U_URLKEY_INTERN_ORIGURL L"[URL]" +#define U_URLSECTION_SHORTCUT L"InternetShortcut" +#define U_URLKEY_URL L"URL" +#define U_URLKEY_TITLE L"Title" +#define U_URLKEY_TARGET L"Target" +#define U_URLKEY_FRAME L"Frame" +#define U_URLKEY_OPENAS L"OpenAs" +#define U_URLKEY_SOICON L"SOIcon" +#define U_URLKEY_WIN_ICONFILE L"IconFile" +#define U_URLKEY_WIN_ICONINDEX L"IconIndex" +#define U_URLKEY_WORKDIR L"WorkingDirectory" +#define U_URLKEY_ARGUMENTS L"Arguments" +#define U_URLKEY_INTERN_ORIGURL L"[URL]" -# define URLSECTION_SHORTCUT U_URLSECTION_SHORTCUT -# define URLKEY_URL U_URLKEY_URL -# define URLKEY_TITLE U_URLKEY_TITLE -# define URLKEY_TARGET U_URLKEY_TARGET -# define URLKEY_FRAME U_URLKEY_FRAME -# define URLKEY_OPENAS U_URLKEY_OPENAS -# define URLKEY_SOICON U_URLKEY_SOICON -# define URLKEY_WIN_ICONFILE U_URLKEY_WIN_ICONFILE -# define URLKEY_WIN_ICONINDEX U_URLKEY_WIN_ICONINDEX -# define URLKEY_WORKDIR U_URLKEY_WORKDIR -# define URLKEY_ARGUMENTS U_URLKEY_ARGUMENTS -# define URLKEY_INTERN_ORIGURL U_URLKEY_INTERN_ORIGURL +# define URLSECTION_SHORTCUT U_URLSECTION_SHORTCUT +# define URLKEY_URL U_URLKEY_URL +# define URLKEY_TITLE U_URLKEY_TITLE +# define URLKEY_TARGET U_URLKEY_TARGET +# define URLKEY_FRAME U_URLKEY_FRAME +# define URLKEY_OPENAS U_URLKEY_OPENAS +# define URLKEY_SOICON U_URLKEY_SOICON +# define URLKEY_WIN_ICONFILE U_URLKEY_WIN_ICONFILE +# define URLKEY_WIN_ICONINDEX U_URLKEY_WIN_ICONINDEX +# define URLKEY_WORKDIR U_URLKEY_WORKDIR +# define URLKEY_ARGUMENTS U_URLKEY_ARGUMENTS +# define URLKEY_INTERN_ORIGURL U_URLKEY_INTERN_ORIGURL #endif // __URLKEYS_HXX diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx index 05fe49fd9fc4..17d52432e206 100644 --- a/tools/inc/tools/urlobj.hxx +++ b/tools/inc/tools/urlobj.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ namespace com { namespace sun { namespace star { namespace util { //============================================================================ // Common URL prefixes for various schemes: -#define INET_FTP_SCHEME "ftp://" +#define INET_FTP_SCHEME "ftp://" #define INET_HTTP_SCHEME "http://" #define INET_HTTPS_SCHEME "https://" #define INET_FILE_SCHEME "file://" @@ -152,7 +152,7 @@ public: /** The way input strings that represent (parts of) URIs are interpreted in set-methods. - @descr Most set-methods accept either a ByteString or a rtl::OUString + @descr Most set-methods accept either a ByteString or a rtl::OUString as input. Using a ByteString, octets in the range 0x80--0xFF are replaced by single escape sequences. Using a rtl::OUString , UTF-32 characters in the range 0x80--0x10FFFF are replaced by sequences of @@ -811,7 +811,7 @@ public: the specified segment does not exist, false is returned. If false is returned, the object is not modified. */ - bool setName(rtl::OUString const & rTheName, + bool setName(rtl::OUString const & rTheName, sal_Int32 nIndex = LAST_SEGMENT, bool bIgnoreFinalSlash = true, EncodeMechanism eMechanism = WAS_ENCODED, @@ -858,7 +858,7 @@ public: the specified segment does not exist, false is returned. If false is returned, the object is not modified. */ - bool setBase(rtl::OUString const & rTheBase, + bool setBase(rtl::OUString const & rTheBase, sal_Int32 nIndex = LAST_SEGMENT, bool bIgnoreFinalSlash = true, EncodeMechanism eMechanism = WAS_ENCODED, @@ -1181,7 +1181,7 @@ public: rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); - static void appendUCS4Escape(rtl::OUStringBuffer & rTheText, + static void appendUCS4Escape(rtl::OUStringBuffer & rTheText, sal_Char cEscapePrefix, sal_uInt32 nUCS4); @@ -1332,7 +1332,7 @@ private: inline void operator +=(sal_Int32 nDelta); - int compare(SubString const & rOther, + int compare(SubString const & rOther, rtl::OUStringBuffer const & rThisString, rtl::OUStringBuffer const & rOtherString) const; }; @@ -1495,9 +1495,9 @@ private: // Coding: static inline rtl::OUString extend(ByteString const & rOctets) - { - return rtl::OUString(rOctets.GetBuffer(), rOctets.Len(), - RTL_TEXTENCODING_ISO_8859_1); + { + return rtl::OUString(rOctets.GetBuffer(), rOctets.Len(), + RTL_TEXTENCODING_ISO_8859_1); } static inline sal_Char getEscapePrefix(INetProtocol eTheScheme) diff --git a/tools/inc/tools/vcompat.hxx b/tools/inc/tools/vcompat.hxx index 87c8a7adf621..f6ee6922faac 100644 --- a/tools/inc/tools/vcompat.hxx +++ b/tools/inc/tools/vcompat.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,9 +35,9 @@ // ----------- #define COMPAT_FORMAT( char1, char2, char3, char4 ) \ - ((UINT32)((((UINT32)(char)(char1)))| \ - (((UINT32)(char)(char2))<<8UL)| \ - (((UINT32)(char)(char3))<<16UL)| \ + ((UINT32)((((UINT32)(char)(char1)))| \ + (((UINT32)(char)(char2))<<8UL)| \ + (((UINT32)(char)(char3))<<16UL)| \ ((UINT32)(char)(char4))<<24UL)) // -------------- @@ -48,23 +48,23 @@ class SvStream; class TOOLS_DLLPUBLIC VersionCompat { - SvStream* mpRWStm; - UINT32 mnCompatPos; - UINT32 mnTotalSize; - UINT16 mnStmMode; - UINT16 mnVersion; + SvStream* mpRWStm; + UINT32 mnCompatPos; + UINT32 mnTotalSize; + UINT16 mnStmMode; + UINT16 mnVersion; VersionCompat() {} VersionCompat( const VersionCompat& ) {} - VersionCompat& operator=( const VersionCompat& ) { return *this; } - BOOL operator==( const VersionCompat& ) { return FALSE; } + VersionCompat& operator=( const VersionCompat& ) { return *this; } + BOOL operator==( const VersionCompat& ) { return FALSE; } public: VersionCompat( SvStream& rStm, USHORT nStreamMode, UINT16 nVersion = 1 ); ~VersionCompat(); - UINT16 GetVersion() const { return mnVersion; } + UINT16 GetVersion() const { return mnVersion; } }; #endif // _VCOMPAT_HXX diff --git a/tools/inc/tools/vector2d.hxx b/tools/inc/tools/vector2d.hxx index 7c04cd8089de..d346e1af2bbf 100644 --- a/tools/inc/tools/vector2d.hxx +++ b/tools/inc/tools/vector2d.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,10 +38,10 @@ class Vector2D { private: - double mfX; - double mfY; - -public: + double mfX; + double mfY; + +public: inline Vector2D() : mfX( 0.0 ), mfY( 0.0 ) {} inline Vector2D( double fX, double fY ) : mfX( fX ), mfY( fY ) {} inline Vector2D( const Vector2D& rVec ) : mfX( rVec.mfX ), mfY( rVec.mfY ) {} @@ -62,46 +62,46 @@ public: inline void Max(const Vector2D& rVec) { if(rVec.mfX > mfX) mfX = rVec.mfX; if(rVec.mfY > mfY) mfY = rVec.mfY; } inline void Abs() { if(mfX < 0.0) mfX = -mfX; if(mfY < 0.0) mfY = -mfY; } - inline void CalcInBetween(Vector2D& rOld1, Vector2D& rOld2, double t) + inline void CalcInBetween(Vector2D& rOld1, Vector2D& rOld2, double t) { mfX = ((rOld2.mfX - rOld1.mfX) + t) + rOld1.mfX; mfY = ((rOld2.mfY - rOld1.mfY) + t) + rOld1.mfY; } - inline void CalcMiddle(Vector2D& rOld1, Vector2D& rOld2) + inline void CalcMiddle(Vector2D& rOld1, Vector2D& rOld2) { mfX = (rOld1.mfX + rOld2.mfX) / 2.0; mfY = (rOld1.mfY + rOld2.mfY) / 2.0; } inline void CalcMiddle(Vector2D& rOld1, Vector2D& rOld2, Vector2D& rOld3) { mfX = (rOld1.mfX + rOld2.mfX + rOld3.mfX) / 3.0; mfY = (rOld1.mfY + rOld2.mfY + rOld3.mfY) / 3.0; } - - inline Vector2D& operator+=( const Vector2D& rVec ) { mfX += rVec.mfX, mfY += rVec.mfY; return *this; } - inline Vector2D& operator-=( const Vector2D& rVec ) { mfX -= rVec.mfX, mfY -= rVec.mfY; return *this; } - inline Vector2D operator+(const Vector2D& rVec) const { Vector2D aSum(*this); aSum += rVec; return aSum; } - inline Vector2D operator-(const Vector2D& rVec) const { Vector2D aSub(*this); aSub -= rVec; return aSub; } - inline Vector2D operator-(void) const { return Vector2D(-mfX, -mfY); } - - inline double Scalar( const Vector2D& rVec ) const { return( mfX * rVec.mfX + mfY * rVec.mfY ); } - - inline Vector2D& operator/=( const Vector2D& rVec ) { mfX /= rVec.mfX, mfY /= rVec.mfY; return *this; } - inline Vector2D& operator*=( const Vector2D& rVec ) { mfX *= rVec.mfX, mfY *= rVec.mfY; return *this; } - inline Vector2D operator/(const Vector2D& rVec) const { Vector2D aDiv(*this); aDiv /= rVec; return aDiv; } - inline Vector2D operator*(const Vector2D& rVec) const { Vector2D aMul(*this); aMul *= rVec; return aMul; } - - inline Vector2D& operator*=(double t) { mfX *= t; mfY *= t; return *this; } - inline Vector2D operator*(double t) const { Vector2D aNew(*this); aNew *= t; return aNew; } - inline Vector2D& operator/=(double t) { mfX /= t; mfY /= t; return *this; } - inline Vector2D operator/(double t) const { Vector2D aNew(*this); aNew /= t; return aNew; } - - inline BOOL operator==( const Vector2D& rVec ) const { return( mfX == rVec.mfX && mfY == rVec.mfY ); } - inline BOOL operator!=( const Vector2D& rVec ) const { return !( *this == rVec ); } - - inline Vector2D& operator=( const Vector2D& rVec ) { mfX = rVec.mfX, mfY = rVec.mfY; return *this; } - inline Vector2D& operator=( const Pair& rPair ) { mfX = rPair.nA, mfY = rPair.nB; return *this; } - inline Vector2D& operator-=( const Pair& rPair ) { mfX -= rPair.nA, mfY -= rPair.nB; return *this; } - inline Vector2D& operator+=( const Pair& rPair ) { mfX += rPair.nA, mfY += rPair.nB; return *this; } - inline Vector2D& operator*=( const Pair& rPair ) { mfX *= rPair.nA, mfY *= rPair.nB; return *this; } - inline Vector2D& operator/=( const Pair& rPair ) { mfX /= rPair.nA, mfY /= rPair.nB; return *this; } - - inline BOOL operator==( const Pair& rPair ) const { return( mfX == rPair.nA && mfY == rPair.nB ); } - inline BOOL operator!=( const Pair& rPair ) const { return !( *this == rPair ); } - - inline BOOL IsPositive( Vector2D& rVec ) const { return( ( mfX * rVec.mfY - mfY * rVec.mfX ) >= 0.0 ); } - inline BOOL IsNegative( Vector2D& rVec ) const { return !IsPositive( rVec ); } + + inline Vector2D& operator+=( const Vector2D& rVec ) { mfX += rVec.mfX, mfY += rVec.mfY; return *this; } + inline Vector2D& operator-=( const Vector2D& rVec ) { mfX -= rVec.mfX, mfY -= rVec.mfY; return *this; } + inline Vector2D operator+(const Vector2D& rVec) const { Vector2D aSum(*this); aSum += rVec; return aSum; } + inline Vector2D operator-(const Vector2D& rVec) const { Vector2D aSub(*this); aSub -= rVec; return aSub; } + inline Vector2D operator-(void) const { return Vector2D(-mfX, -mfY); } + + inline double Scalar( const Vector2D& rVec ) const { return( mfX * rVec.mfX + mfY * rVec.mfY ); } + + inline Vector2D& operator/=( const Vector2D& rVec ) { mfX /= rVec.mfX, mfY /= rVec.mfY; return *this; } + inline Vector2D& operator*=( const Vector2D& rVec ) { mfX *= rVec.mfX, mfY *= rVec.mfY; return *this; } + inline Vector2D operator/(const Vector2D& rVec) const { Vector2D aDiv(*this); aDiv /= rVec; return aDiv; } + inline Vector2D operator*(const Vector2D& rVec) const { Vector2D aMul(*this); aMul *= rVec; return aMul; } + + inline Vector2D& operator*=(double t) { mfX *= t; mfY *= t; return *this; } + inline Vector2D operator*(double t) const { Vector2D aNew(*this); aNew *= t; return aNew; } + inline Vector2D& operator/=(double t) { mfX /= t; mfY /= t; return *this; } + inline Vector2D operator/(double t) const { Vector2D aNew(*this); aNew /= t; return aNew; } + + inline BOOL operator==( const Vector2D& rVec ) const { return( mfX == rVec.mfX && mfY == rVec.mfY ); } + inline BOOL operator!=( const Vector2D& rVec ) const { return !( *this == rVec ); } + + inline Vector2D& operator=( const Vector2D& rVec ) { mfX = rVec.mfX, mfY = rVec.mfY; return *this; } + inline Vector2D& operator=( const Pair& rPair ) { mfX = rPair.nA, mfY = rPair.nB; return *this; } + inline Vector2D& operator-=( const Pair& rPair ) { mfX -= rPair.nA, mfY -= rPair.nB; return *this; } + inline Vector2D& operator+=( const Pair& rPair ) { mfX += rPair.nA, mfY += rPair.nB; return *this; } + inline Vector2D& operator*=( const Pair& rPair ) { mfX *= rPair.nA, mfY *= rPair.nB; return *this; } + inline Vector2D& operator/=( const Pair& rPair ) { mfX /= rPair.nA, mfY /= rPair.nB; return *this; } + + inline BOOL operator==( const Pair& rPair ) const { return( mfX == rPair.nA && mfY == rPair.nB ); } + inline BOOL operator!=( const Pair& rPair ) const { return !( *this == rPair ); } + + inline BOOL IsPositive( Vector2D& rVec ) const { return( ( mfX * rVec.mfY - mfY * rVec.mfX ) >= 0.0 ); } + inline BOOL IsNegative( Vector2D& rVec ) const { return !IsPositive( rVec ); } }; // ----------------------------------------------------------------------------- diff --git a/tools/inc/tools/weakbase.h b/tools/inc/tools/weakbase.h index 7aff87446cb8..a66da8c7c33f 100644 --- a/tools/inc/tools/weakbase.h +++ b/tools/inc/tools/weakbase.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,8 +69,8 @@ namespace tools template <class reference_type> struct WeakConnection { - sal_Int32 mnRefCount; - reference_type* mpReference; + sal_Int32 mnRefCount; + reference_type* mpReference; WeakConnection( reference_type* pReference ) : mnRefCount( 0 ), mpReference( pReference ) {}; void acquire() { mnRefCount++; } @@ -114,13 +114,13 @@ public: inline sal_Bool operator== (const WeakReference<reference_type> & handle) const; /** only needed for using this class with stl containers */ - inline sal_Bool operator!= (const WeakReference<reference_type> & handle) const; + inline sal_Bool operator!= (const WeakReference<reference_type> & handle) const; /** only needed for using this class with stl containers */ - inline sal_Bool operator< (const WeakReference<reference_type> & handle) const; + inline sal_Bool operator< (const WeakReference<reference_type> & handle) const; /** only needed for using this class with stl containers */ - inline sal_Bool operator> (const WeakReference<reference_type> & handle) const; + inline sal_Bool operator> (const WeakReference<reference_type> & handle) const; /** the assignment operator */ inline WeakReference<reference_type>& operator= (const WeakReference<reference_type> & handle); diff --git a/tools/inc/tools/weakbase.hxx b/tools/inc/tools/weakbase.hxx index 32aae7f7ee22..81f53fb3516b 100644 --- a/tools/inc/tools/weakbase.hxx +++ b/tools/inc/tools/weakbase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -111,19 +111,19 @@ inline sal_Bool WeakReference< reference_type >::operator==(const WeakReference< } template< class reference_type > -inline sal_Bool WeakReference< reference_type >::operator!=(const WeakReference<reference_type> & handle) const +inline sal_Bool WeakReference< reference_type >::operator!=(const WeakReference<reference_type> & handle) const { return mpWeakConnection != handle.mpWeakConnection; } template< class reference_type > -inline sal_Bool WeakReference< reference_type >::operator<(const WeakReference<reference_type> & handle) const +inline sal_Bool WeakReference< reference_type >::operator<(const WeakReference<reference_type> & handle) const { return mpWeakConnection->mpReference < handle.mpWeakConnection->mpReference; } template< class reference_type > -inline sal_Bool WeakReference< reference_type >::operator>(const WeakReference<reference_type> & handle) const +inline sal_Bool WeakReference< reference_type >::operator>(const WeakReference<reference_type> & handle) const { return mpWeakConnection->mpReference > handle.mpWeakConnection->mpReference; } diff --git a/tools/inc/tools/wintypes.hxx b/tools/inc/tools/wintypes.hxx index 87a9bbe5ca8c..4ce2b24ac717 100644 --- a/tools/inc/tools/wintypes.hxx +++ b/tools/inc/tools/wintypes.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,89 +35,89 @@ // ---------------- typedef USHORT WindowType; -#define WINDOW_BASE 0x0100 -#define WINDOW_FIRST (WINDOW_BASE + 0x30) -#define WINDOW_MESSBOX (WINDOW_FIRST) -#define WINDOW_INFOBOX (WINDOW_FIRST + 0x01) -#define WINDOW_WARNINGBOX (WINDOW_FIRST + 0x02) -#define WINDOW_ERRORBOX (WINDOW_FIRST + 0x03) -#define WINDOW_QUERYBOX (WINDOW_FIRST + 0x04) -#define WINDOW_WINDOW (WINDOW_FIRST + 0x05) -#define WINDOW_SYSWINDOW (WINDOW_FIRST + 0x06) -#define WINDOW_WORKWINDOW (WINDOW_FIRST + 0x07) -// #define WINDOW_MDIWINDOW (WINDOW_FIRST + 0x08) -#define WINDOW_FLOATINGWINDOW (WINDOW_FIRST + 0x09) -#define WINDOW_DIALOG (WINDOW_FIRST + 0x0a) -#define WINDOW_MODELESSDIALOG (WINDOW_FIRST + 0x0b) -#define WINDOW_MODALDIALOG (WINDOW_FIRST + 0x0c) -#define WINDOW_SYSTEMDIALOG (WINDOW_FIRST + 0x0d) -#define WINDOW_PATHDIALOG (WINDOW_FIRST + 0x0e) -#define WINDOW_FILEDIALOG (WINDOW_FIRST + 0x0f) -#define WINDOW_PRINTERSETUPDIALOG (WINDOW_FIRST + 0x10) -#define WINDOW_PRINTDIALOG (WINDOW_FIRST + 0x11) -#define WINDOW_COLORDIALOG (WINDOW_FIRST + 0x12) -#define WINDOW_FONTDIALOG (WINDOW_FIRST + 0x13) -#define WINDOW_CONTROL (WINDOW_FIRST + 0x14) -#define WINDOW_BUTTON (WINDOW_FIRST + 0x15) -#define WINDOW_PUSHBUTTON (WINDOW_FIRST + 0x16) -#define WINDOW_OKBUTTON (WINDOW_FIRST + 0x17) -#define WINDOW_CANCELBUTTON (WINDOW_FIRST + 0x18) -#define WINDOW_HELPBUTTON (WINDOW_FIRST + 0x19) -#define WINDOW_IMAGEBUTTON (WINDOW_FIRST + 0x1a) -#define WINDOW_MENUBUTTON (WINDOW_FIRST + 0x1b) -#define WINDOW_MOREBUTTON (WINDOW_FIRST + 0x1c) -#define WINDOW_SPINBUTTON (WINDOW_FIRST + 0x1d) -#define WINDOW_RADIOBUTTON (WINDOW_FIRST + 0x1e) -#define WINDOW_IMAGERADIOBUTTON (WINDOW_FIRST + 0x1f) -#define WINDOW_CHECKBOX (WINDOW_FIRST + 0x20) -#define WINDOW_TRISTATEBOX (WINDOW_FIRST + 0x21) -#define WINDOW_EDIT (WINDOW_FIRST + 0x22) -#define WINDOW_MULTILINEEDIT (WINDOW_FIRST + 0x23) -#define WINDOW_COMBOBOX (WINDOW_FIRST + 0x24) -#define WINDOW_LISTBOX (WINDOW_FIRST + 0x25) -#define WINDOW_MULTILISTBOX (WINDOW_FIRST + 0x26) -#define WINDOW_FIXEDTEXT (WINDOW_FIRST + 0x27) -#define WINDOW_FIXEDLINE (WINDOW_FIRST + 0x28) -#define WINDOW_FIXEDBITMAP (WINDOW_FIRST + 0x29) -#define WINDOW_FIXEDIMAGE (WINDOW_FIRST + 0x2a) -#define WINDOW_GROUPBOX (WINDOW_FIRST + 0x2c) -#define WINDOW_SCROLLBAR (WINDOW_FIRST + 0x2d) -#define WINDOW_SCROLLBARBOX (WINDOW_FIRST + 0x2e) -#define WINDOW_SPLITTER (WINDOW_FIRST + 0x2f) -#define WINDOW_SPLITWINDOW (WINDOW_FIRST + 0x30) -#define WINDOW_SPINFIELD (WINDOW_FIRST + 0x31) -#define WINDOW_PATTERNFIELD (WINDOW_FIRST + 0x32) -#define WINDOW_NUMERICFIELD (WINDOW_FIRST + 0x33) -#define WINDOW_METRICFIELD (WINDOW_FIRST + 0x34) -#define WINDOW_CURRENCYFIELD (WINDOW_FIRST + 0x35) -#define WINDOW_DATEFIELD (WINDOW_FIRST + 0x36) -#define WINDOW_TIMEFIELD (WINDOW_FIRST + 0x37) -#define WINDOW_PATTERNBOX (WINDOW_FIRST + 0x38) -#define WINDOW_NUMERICBOX (WINDOW_FIRST + 0x39) -#define WINDOW_METRICBOX (WINDOW_FIRST + 0x3a) -#define WINDOW_CURRENCYBOX (WINDOW_FIRST + 0x3b) -#define WINDOW_DATEBOX (WINDOW_FIRST + 0x3c) -#define WINDOW_TIMEBOX (WINDOW_FIRST + 0x3d) -#define WINDOW_LONGCURRENCYFIELD (WINDOW_FIRST + 0x3e) -#define WINDOW_LONGCURRENCYBOX (WINDOW_FIRST + 0x3f) -#define WINDOW_TOOLBOX (WINDOW_FIRST + 0x41) -#define WINDOW_DOCKINGWINDOW (WINDOW_FIRST + 0x42) -#define WINDOW_STATUSBAR (WINDOW_FIRST + 0x43) -#define WINDOW_TABPAGE (WINDOW_FIRST + 0x44) -#define WINDOW_TABCONTROL (WINDOW_FIRST + 0x45) -#define WINDOW_TABDIALOG (WINDOW_FIRST + 0x46) -#define WINDOW_BORDERWINDOW (WINDOW_FIRST + 0x47) -#define WINDOW_BUTTONDIALOG (WINDOW_FIRST + 0x48) -#define WINDOW_SYSTEMCHILDWINDOW (WINDOW_FIRST + 0x49) -#define WINDOW_FIXEDBORDER (WINDOW_FIRST + 0x4a) -#define WINDOW_SLIDER (WINDOW_FIRST + 0x4b) +#define WINDOW_BASE 0x0100 +#define WINDOW_FIRST (WINDOW_BASE + 0x30) +#define WINDOW_MESSBOX (WINDOW_FIRST) +#define WINDOW_INFOBOX (WINDOW_FIRST + 0x01) +#define WINDOW_WARNINGBOX (WINDOW_FIRST + 0x02) +#define WINDOW_ERRORBOX (WINDOW_FIRST + 0x03) +#define WINDOW_QUERYBOX (WINDOW_FIRST + 0x04) +#define WINDOW_WINDOW (WINDOW_FIRST + 0x05) +#define WINDOW_SYSWINDOW (WINDOW_FIRST + 0x06) +#define WINDOW_WORKWINDOW (WINDOW_FIRST + 0x07) +// #define WINDOW_MDIWINDOW (WINDOW_FIRST + 0x08) +#define WINDOW_FLOATINGWINDOW (WINDOW_FIRST + 0x09) +#define WINDOW_DIALOG (WINDOW_FIRST + 0x0a) +#define WINDOW_MODELESSDIALOG (WINDOW_FIRST + 0x0b) +#define WINDOW_MODALDIALOG (WINDOW_FIRST + 0x0c) +#define WINDOW_SYSTEMDIALOG (WINDOW_FIRST + 0x0d) +#define WINDOW_PATHDIALOG (WINDOW_FIRST + 0x0e) +#define WINDOW_FILEDIALOG (WINDOW_FIRST + 0x0f) +#define WINDOW_PRINTERSETUPDIALOG (WINDOW_FIRST + 0x10) +#define WINDOW_PRINTDIALOG (WINDOW_FIRST + 0x11) +#define WINDOW_COLORDIALOG (WINDOW_FIRST + 0x12) +#define WINDOW_FONTDIALOG (WINDOW_FIRST + 0x13) +#define WINDOW_CONTROL (WINDOW_FIRST + 0x14) +#define WINDOW_BUTTON (WINDOW_FIRST + 0x15) +#define WINDOW_PUSHBUTTON (WINDOW_FIRST + 0x16) +#define WINDOW_OKBUTTON (WINDOW_FIRST + 0x17) +#define WINDOW_CANCELBUTTON (WINDOW_FIRST + 0x18) +#define WINDOW_HELPBUTTON (WINDOW_FIRST + 0x19) +#define WINDOW_IMAGEBUTTON (WINDOW_FIRST + 0x1a) +#define WINDOW_MENUBUTTON (WINDOW_FIRST + 0x1b) +#define WINDOW_MOREBUTTON (WINDOW_FIRST + 0x1c) +#define WINDOW_SPINBUTTON (WINDOW_FIRST + 0x1d) +#define WINDOW_RADIOBUTTON (WINDOW_FIRST + 0x1e) +#define WINDOW_IMAGERADIOBUTTON (WINDOW_FIRST + 0x1f) +#define WINDOW_CHECKBOX (WINDOW_FIRST + 0x20) +#define WINDOW_TRISTATEBOX (WINDOW_FIRST + 0x21) +#define WINDOW_EDIT (WINDOW_FIRST + 0x22) +#define WINDOW_MULTILINEEDIT (WINDOW_FIRST + 0x23) +#define WINDOW_COMBOBOX (WINDOW_FIRST + 0x24) +#define WINDOW_LISTBOX (WINDOW_FIRST + 0x25) +#define WINDOW_MULTILISTBOX (WINDOW_FIRST + 0x26) +#define WINDOW_FIXEDTEXT (WINDOW_FIRST + 0x27) +#define WINDOW_FIXEDLINE (WINDOW_FIRST + 0x28) +#define WINDOW_FIXEDBITMAP (WINDOW_FIRST + 0x29) +#define WINDOW_FIXEDIMAGE (WINDOW_FIRST + 0x2a) +#define WINDOW_GROUPBOX (WINDOW_FIRST + 0x2c) +#define WINDOW_SCROLLBAR (WINDOW_FIRST + 0x2d) +#define WINDOW_SCROLLBARBOX (WINDOW_FIRST + 0x2e) +#define WINDOW_SPLITTER (WINDOW_FIRST + 0x2f) +#define WINDOW_SPLITWINDOW (WINDOW_FIRST + 0x30) +#define WINDOW_SPINFIELD (WINDOW_FIRST + 0x31) +#define WINDOW_PATTERNFIELD (WINDOW_FIRST + 0x32) +#define WINDOW_NUMERICFIELD (WINDOW_FIRST + 0x33) +#define WINDOW_METRICFIELD (WINDOW_FIRST + 0x34) +#define WINDOW_CURRENCYFIELD (WINDOW_FIRST + 0x35) +#define WINDOW_DATEFIELD (WINDOW_FIRST + 0x36) +#define WINDOW_TIMEFIELD (WINDOW_FIRST + 0x37) +#define WINDOW_PATTERNBOX (WINDOW_FIRST + 0x38) +#define WINDOW_NUMERICBOX (WINDOW_FIRST + 0x39) +#define WINDOW_METRICBOX (WINDOW_FIRST + 0x3a) +#define WINDOW_CURRENCYBOX (WINDOW_FIRST + 0x3b) +#define WINDOW_DATEBOX (WINDOW_FIRST + 0x3c) +#define WINDOW_TIMEBOX (WINDOW_FIRST + 0x3d) +#define WINDOW_LONGCURRENCYFIELD (WINDOW_FIRST + 0x3e) +#define WINDOW_LONGCURRENCYBOX (WINDOW_FIRST + 0x3f) +#define WINDOW_TOOLBOX (WINDOW_FIRST + 0x41) +#define WINDOW_DOCKINGWINDOW (WINDOW_FIRST + 0x42) +#define WINDOW_STATUSBAR (WINDOW_FIRST + 0x43) +#define WINDOW_TABPAGE (WINDOW_FIRST + 0x44) +#define WINDOW_TABCONTROL (WINDOW_FIRST + 0x45) +#define WINDOW_TABDIALOG (WINDOW_FIRST + 0x46) +#define WINDOW_BORDERWINDOW (WINDOW_FIRST + 0x47) +#define WINDOW_BUTTONDIALOG (WINDOW_FIRST + 0x48) +#define WINDOW_SYSTEMCHILDWINDOW (WINDOW_FIRST + 0x49) +#define WINDOW_FIXEDBORDER (WINDOW_FIRST + 0x4a) +#define WINDOW_SLIDER (WINDOW_FIRST + 0x4b) #define WINDOW_MENUBARWINDOW (WINDOW_FIRST + 0x4c) -#define WINDOW_TREELISTBOX (WINDOW_FIRST + 0x4d) -#define WINDOW_HELPTEXTWINDOW (WINDOW_FIRST + 0x4e) -#define WINDOW_INTROWINDOW (WINDOW_FIRST + 0x4f) +#define WINDOW_TREELISTBOX (WINDOW_FIRST + 0x4d) +#define WINDOW_HELPTEXTWINDOW (WINDOW_FIRST + 0x4e) +#define WINDOW_INTROWINDOW (WINDOW_FIRST + 0x4f) #define WINDOW_LISTBOXWINDOW (WINDOW_FIRST + 0x50) #define WINDOW_DOCKINGAREA (WINDOW_FIRST + 0x51) -#define WINDOW_LAST (WINDOW_DOCKINGAREA) +#define WINDOW_LAST (WINDOW_DOCKINGAREA) // --------------- @@ -128,23 +128,23 @@ typedef USHORT WindowType; typedef sal_Int64 WinBits; // Window-Bits fuer Window -#define WB_CLIPCHILDREN ((WinBits)0x00000001) -#define WB_DIALOGCONTROL ((WinBits)0x00000002) -#define WB_NODIALOGCONTROL ((WinBits)0x00000004) -#define WB_BORDER ((WinBits)0x00000008) -#define WB_NOBORDER ((WinBits)0x00000010) -#define WB_SIZEABLE ((WinBits)0x00000020) -#define WB_3DLOOK ((WinBits)0x00000040) -#define WB_AUTOSIZE ((WinBits)0x00000080) +#define WB_CLIPCHILDREN ((WinBits)0x00000001) +#define WB_DIALOGCONTROL ((WinBits)0x00000002) +#define WB_NODIALOGCONTROL ((WinBits)0x00000004) +#define WB_BORDER ((WinBits)0x00000008) +#define WB_NOBORDER ((WinBits)0x00000010) +#define WB_SIZEABLE ((WinBits)0x00000020) +#define WB_3DLOOK ((WinBits)0x00000040) +#define WB_AUTOSIZE ((WinBits)0x00000080) // Window-Bits fuer SystemWindows -#define WB_MOVEABLE ((WinBits)0x00000100) -#define WB_ROLLABLE ((WinBits)0x00000200) -#define WB_CLOSEABLE ((WinBits)0x00000400) -#define WB_STANDALONE ((WinBits)0x00000800) -#define WB_APP ((WinBits)0x00001000) -#define WB_PINABLE ((WinBits)0x00002000) -#define WB_SYSTEMWINDOW ((WinBits)SAL_CONST_INT64(0x40000000)) +#define WB_MOVEABLE ((WinBits)0x00000100) +#define WB_ROLLABLE ((WinBits)0x00000200) +#define WB_CLOSEABLE ((WinBits)0x00000400) +#define WB_STANDALONE ((WinBits)0x00000800) +#define WB_APP ((WinBits)0x00001000) +#define WB_PINABLE ((WinBits)0x00002000) +#define WB_SYSTEMWINDOW ((WinBits)SAL_CONST_INT64(0x40000000)) // warning: do not confuse WB_SYSTEMCHILDWINDOW with the SystemChildWindow class // the SystemChildWindow class was there first and is a very specialized @@ -155,38 +155,38 @@ typedef sal_Int64 WinBits; // which should be created as system child windows with (more or less) // normal event handling #define WB_SYSTEMCHILDWINDOW ((WinBits)SAL_CONST_INT64(0x8000000000)) -#define WB_SIZEMOVE (WB_SIZEABLE | WB_MOVEABLE) +#define WB_SIZEMOVE (WB_SIZEABLE | WB_MOVEABLE) // Standard-Window-Bits fuer ChildWindows -#define WB_TABSTOP ((WinBits)0x00000100) -#define WB_NOTABSTOP ((WinBits)0x00000200) -#define WB_GROUP ((WinBits)0x00000400) -#define WB_NOGROUP ((WinBits)0x00000800) -#define WB_HORZ ((WinBits)0x00001000) -#define WB_VERT ((WinBits)0x00002000) -#define WB_LEFT ((WinBits)0x00004000) -#define WB_CENTER ((WinBits)0x00008000) -#define WB_RIGHT ((WinBits)0x00010000) -#define WB_TOP ((WinBits)0x00020000) -#define WB_VCENTER ((WinBits)0x00040000) -#define WB_BOTTOM ((WinBits)0x00080000) -#define WB_DRAG ((WinBits)0x00100000) -#define WB_SPIN ((WinBits)0x00200000) -#define WB_REPEAT ((WinBits)0x00400000) -#define WB_NOPOINTERFOCUS ((WinBits)0x00800000) -#define WB_WORDBREAK ((WinBits)0x01000000) -#define WB_NOLABEL ((WinBits)0x02000000) -#define WB_SORT ((WinBits)0x04000000) -#define WB_DROPDOWN ((WinBits)0x08000000) -#define WB_HIDE ((WinBits)SAL_CONST_INT64(0x80000000)) -#define WB_AUTOHSCROLL ((WinBits)SAL_CONST_INT64(0x10000000)) -#define WB_DOCKABLE ((WinBits)SAL_CONST_INT64(0x20000000)) +#define WB_TABSTOP ((WinBits)0x00000100) +#define WB_NOTABSTOP ((WinBits)0x00000200) +#define WB_GROUP ((WinBits)0x00000400) +#define WB_NOGROUP ((WinBits)0x00000800) +#define WB_HORZ ((WinBits)0x00001000) +#define WB_VERT ((WinBits)0x00002000) +#define WB_LEFT ((WinBits)0x00004000) +#define WB_CENTER ((WinBits)0x00008000) +#define WB_RIGHT ((WinBits)0x00010000) +#define WB_TOP ((WinBits)0x00020000) +#define WB_VCENTER ((WinBits)0x00040000) +#define WB_BOTTOM ((WinBits)0x00080000) +#define WB_DRAG ((WinBits)0x00100000) +#define WB_SPIN ((WinBits)0x00200000) +#define WB_REPEAT ((WinBits)0x00400000) +#define WB_NOPOINTERFOCUS ((WinBits)0x00800000) +#define WB_WORDBREAK ((WinBits)0x01000000) +#define WB_NOLABEL ((WinBits)0x02000000) +#define WB_SORT ((WinBits)0x04000000) +#define WB_DROPDOWN ((WinBits)0x08000000) +#define WB_HIDE ((WinBits)SAL_CONST_INT64(0x80000000)) +#define WB_AUTOHSCROLL ((WinBits)SAL_CONST_INT64(0x10000000)) +#define WB_DOCKABLE ((WinBits)SAL_CONST_INT64(0x20000000)) #define WB_AUTOVSCROLL ((WinBits)SAL_CONST_INT64(0x40000000)) #define WB_HYPHENATION (((WinBits)SAL_CONST_INT64(0x800000000)) | WB_WORDBREAK) -#define WB_CHILDDLGCTRL ((WinBits)SAL_CONST_INT64(0x100000000000)) +#define WB_CHILDDLGCTRL ((WinBits)SAL_CONST_INT64(0x100000000000)) // system floating window -#define WB_SYSTEMFLOATWIN ((WinBits)SAL_CONST_INT64(0x100000000)) +#define WB_SYSTEMFLOATWIN ((WinBits)SAL_CONST_INT64(0x100000000)) #define WB_INTROWIN ((WinBits)SAL_CONST_INT64(0x200000000)) #define WB_NOSHADOW ((WinBits)SAL_CONST_INT64(0x400000000)) #define WB_TOOLTIPWIN ((WinBits)SAL_CONST_INT64(0x800000000)) @@ -195,99 +195,99 @@ typedef sal_Int64 WinBits; #define WB_NEEDSFOCUS ((WinBits)SAL_CONST_INT64(0x1000000000)) #define WB_POPUP ((WinBits)SAL_CONST_INT64(0x20000000)) -#define WB_HSCROLL WB_HORZ -#define WB_VSCROLL WB_VERT -#define WB_TOPIMAGE WB_TOP +#define WB_HSCROLL WB_HORZ +#define WB_VSCROLL WB_VERT +#define WB_TOPIMAGE WB_TOP // Window-Bits for PushButtons -#define WB_DEFBUTTON ((WinBits)0x10000000) -#define WB_NOLIGHTBORDER ((WinBits)0x20000000) -#define WB_RECTSTYLE ((WinBits)0x08000000) -#define WB_SMALLSTYLE ((WinBits)0x04000000) +#define WB_DEFBUTTON ((WinBits)0x10000000) +#define WB_NOLIGHTBORDER ((WinBits)0x20000000) +#define WB_RECTSTYLE ((WinBits)0x08000000) +#define WB_SMALLSTYLE ((WinBits)0x04000000) #define WB_TOGGLE ((WinBits)SAL_CONST_INT64(0x1000000000)) #define WB_BEVELBUTTON ((WinBits)SAL_CONST_INT64(0x2000000000)) #define WB_FLATBUTTON ((WinBits)SAL_CONST_INT64(0x4000000000)) // Window-Bits for FixedText -#define WB_PATHELLIPSIS ((WinBits)0x00100000) -#define WB_EXTRAOFFSET ((WinBits)0x02000000) -#define WB_NOMULTILINE ((WinBits)0x10000000) -#define WB_INFO ((WinBits)0x20000000) +#define WB_PATHELLIPSIS ((WinBits)0x00100000) +#define WB_EXTRAOFFSET ((WinBits)0x02000000) +#define WB_NOMULTILINE ((WinBits)0x10000000) +#define WB_INFO ((WinBits)0x20000000) // Window-Bits for CheckBox #define WB_CBLINESTYLE ((WinBits)SAL_CONST_INT64(0x2000000000)) #define WB_EARLYTOGGLE ((WinBits)SAL_CONST_INT64(0x4000000000)) // Window-Bits for Edit -#define WB_PASSWORD ((WinBits)0x01000000) -#define WB_READONLY ((WinBits)0x02000000) -#define WB_NOHIDESELECTION ((WinBits)SAL_CONST_INT64(0x1000000000)) +#define WB_PASSWORD ((WinBits)0x01000000) +#define WB_READONLY ((WinBits)0x02000000) +#define WB_NOHIDESELECTION ((WinBits)SAL_CONST_INT64(0x1000000000)) #define WB_FORCECTRLBACKGROUND ((WinBits)0x80000000) // Window-Bits for MultiLineEdit -#define WB_IGNORETAB ((WinBits)0x20000000) +#define WB_IGNORETAB ((WinBits)0x20000000) // Window-Bits for ListBox and MultiListBox -#define WB_SIMPLEMODE ((WinBits)0x20000000) +#define WB_SIMPLEMODE ((WinBits)0x20000000) // Window-Bits for FixedBitmap -#define WB_FAST ((WinBits)0x04000000) -#define WB_SCALE ((WinBits)0x08000000) -#define WB_TOPLEFTVISIBLE ((WinBits)0x10000000) +#define WB_FAST ((WinBits)0x04000000) +#define WB_SCALE ((WinBits)0x08000000) +#define WB_TOPLEFTVISIBLE ((WinBits)0x10000000) // Window-Bits for ToolBox -#define WB_LINESPACING ((WinBits)0x01000000) -#define WB_SCROLL ((WinBits)0x02000000) -#define WB_FORCETABCYCLE ((WinBits)0x04000000) +#define WB_LINESPACING ((WinBits)0x01000000) +#define WB_SCROLL ((WinBits)0x02000000) +#define WB_FORCETABCYCLE ((WinBits)0x04000000) // Window-Bits for TabControl -#define WB_SINGLELINE ((WinBits)0x02000000) +#define WB_SINGLELINE ((WinBits)0x02000000) // Window-Bits for DockingWindows -#define WB_DOCKBORDER ((WinBits)0x00001000) +#define WB_DOCKBORDER ((WinBits)0x00001000) // Window-Bits for SplitWindow -#define WB_NOSPLITDRAW ((WinBits)0x01000000) -#define WB_FLATSPLITDRAW ((WinBits)0x02000000) +#define WB_NOSPLITDRAW ((WinBits)0x01000000) +#define WB_FLATSPLITDRAW ((WinBits)0x02000000) // Window-Bits for MessageBoxen -#define WB_OK ((WinBits)0x00100000) -#define WB_OK_CANCEL ((WinBits)0x00200000) -#define WB_YES_NO ((WinBits)0x00400000) -#define WB_YES_NO_CANCEL ((WinBits)0x00800000) -#define WB_RETRY_CANCEL ((WinBits)0x01000000) -#define WB_DEF_OK ((WinBits)0x02000000) -#define WB_DEF_CANCEL ((WinBits)0x04000000) -#define WB_DEF_RETRY ((WinBits)0x08000000) -#define WB_DEF_YES ((WinBits)SAL_CONST_INT64(0x10000000)) -#define WB_DEF_NO ((WinBits)SAL_CONST_INT64(0x20000000)) +#define WB_OK ((WinBits)0x00100000) +#define WB_OK_CANCEL ((WinBits)0x00200000) +#define WB_YES_NO ((WinBits)0x00400000) +#define WB_YES_NO_CANCEL ((WinBits)0x00800000) +#define WB_RETRY_CANCEL ((WinBits)0x01000000) +#define WB_DEF_OK ((WinBits)0x02000000) +#define WB_DEF_CANCEL ((WinBits)0x04000000) +#define WB_DEF_RETRY ((WinBits)0x08000000) +#define WB_DEF_YES ((WinBits)SAL_CONST_INT64(0x10000000)) +#define WB_DEF_NO ((WinBits)SAL_CONST_INT64(0x20000000)) #define WB_ABORT_RETRY_IGNORE ((WinBits)SAL_CONST_INT64(0x1000000000)) #define WB_DEF_IGNORE ((WinBits)SAL_CONST_INT64(0x2000000000)) // Standard-WinBits -#define WB_STDWORK (WB_SIZEMOVE | WB_CLOSEABLE) -#define WB_STDDOCKWIN (WB_DOCKABLE | WB_MOVEABLE | WB_CLOSEABLE) -#define WB_STDFLOATWIN (WB_SIZEMOVE | WB_CLOSEABLE | WB_ROLLABLE) -#define WB_STDDIALOG (WB_MOVEABLE | WB_CLOSEABLE) -#define WB_STDMODELESS (WB_STDDIALOG) -#define WB_STDMODAL (WB_STDDIALOG) -#define WB_STDTABDIALOG (WB_STDDIALOG) -#define WB_STDTABCONTROL 0 -#define WB_STDPOPUP (WB_BORDER | WB_POPUP | WB_SYSTEMWINDOW | WB_3DLOOK | WB_DIALOGCONTROL) +#define WB_STDWORK (WB_SIZEMOVE | WB_CLOSEABLE) +#define WB_STDDOCKWIN (WB_DOCKABLE | WB_MOVEABLE | WB_CLOSEABLE) +#define WB_STDFLOATWIN (WB_SIZEMOVE | WB_CLOSEABLE | WB_ROLLABLE) +#define WB_STDDIALOG (WB_MOVEABLE | WB_CLOSEABLE) +#define WB_STDMODELESS (WB_STDDIALOG) +#define WB_STDMODAL (WB_STDDIALOG) +#define WB_STDTABDIALOG (WB_STDDIALOG) +#define WB_STDTABCONTROL 0 +#define WB_STDPOPUP (WB_BORDER | WB_POPUP | WB_SYSTEMWINDOW | WB_3DLOOK | WB_DIALOGCONTROL) // For TreeListBox -#define WB_HASBUTTONS ((WinBits)0x00800000) -#define WB_HASLINES ((WinBits)0x01000000) -#define WB_HASLINESATROOT ((WinBits)0x02000000) +#define WB_HASBUTTONS ((WinBits)0x00800000) +#define WB_HASLINES ((WinBits)0x01000000) +#define WB_HASLINESATROOT ((WinBits)0x02000000) // For FileOpen Dialog -#define WB_PATH ((WinBits)0x00100000) -#define WB_OPEN ((WinBits)0x00200000) -#define WB_SAVEAS ((WinBits)0x00400000) +#define WB_PATH ((WinBits)0x00100000) +#define WB_OPEN ((WinBits)0x00200000) +#define WB_SAVEAS ((WinBits)0x00400000) // For Slider // Window-Bits for TabControl -#define WB_SLIDERSET ((WinBits)0x02000000) +#define WB_SLIDERSET ((WinBits)0x02000000) // -------------------- @@ -321,18 +321,18 @@ enum TriState { STATE_NOCHECK, STATE_CHECK, STATE_DONTKNOW }; // ---------------------- typedef USHORT StandardButtonType; -#define BUTTON_OK ((StandardButtonType)0) -#define BUTTON_CANCEL ((StandardButtonType)1) -#define BUTTON_YES ((StandardButtonType)2) -#define BUTTON_NO ((StandardButtonType)3) -#define BUTTON_RETRY ((StandardButtonType)4) -#define BUTTON_HELP ((StandardButtonType)5) -#define BUTTON_CLOSE ((StandardButtonType)6) -#define BUTTON_MORE ((StandardButtonType)7) -#define BUTTON_IGNORE ((StandardButtonType)8) -#define BUTTON_ABORT ((StandardButtonType)9) -#define BUTTON_LESS ((StandardButtonType)10) -#define BUTTON_COUNT 11 +#define BUTTON_OK ((StandardButtonType)0) +#define BUTTON_CANCEL ((StandardButtonType)1) +#define BUTTON_YES ((StandardButtonType)2) +#define BUTTON_NO ((StandardButtonType)3) +#define BUTTON_RETRY ((StandardButtonType)4) +#define BUTTON_HELP ((StandardButtonType)5) +#define BUTTON_CLOSE ((StandardButtonType)6) +#define BUTTON_MORE ((StandardButtonType)7) +#define BUTTON_IGNORE ((StandardButtonType)8) +#define BUTTON_ABORT ((StandardButtonType)9) +#define BUTTON_LESS ((StandardButtonType)10) +#define BUTTON_COUNT 11 // -------------------------------------------- // - prominent place for ListBox window types - diff --git a/tools/inc/tools/wldcrd.hxx b/tools/inc/tools/wldcrd.hxx index 29b2c7a47894..478566ce9b44 100644 --- a/tools/inc/tools/wldcrd.hxx +++ b/tools/inc/tools/wldcrd.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/inc/tools/zcodec.hxx b/tools/inc/tools/zcodec.hxx index d6dac6845262..430caa363663 100644 --- a/tools/inc/tools/zcodec.hxx +++ b/tools/inc/tools/zcodec.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,33 +35,33 @@ // - Defines - // ----------- -#define DEFAULT_IN_BUFSIZE (0x00008000UL) -#define DEFAULT_OUT_BUFSIZE (0x00008000UL) +#define DEFAULT_IN_BUFSIZE (0x00008000UL) +#define DEFAULT_OUT_BUFSIZE (0x00008000UL) #define MAX_MEM_USAGE 8 // // memory requirement using compress: -// [ INBUFFER ] + [ OUTBUFFER ] + 128KB + 1 << (MEM_USAGE+9) +// [ INBUFFER ] + [ OUTBUFFER ] + 128KB + 1 << (MEM_USAGE+9) // // memory requirement using decompress: -// [ INBUFFER ] + [ OUTBUFFER ] + 32KB +// [ INBUFFER ] + [ OUTBUFFER ] + 32KB // -#define ZCODEC_NO_COMPRESSION (0x00000000UL) -#define ZCODEC_BEST_SPEED (0x00000001UL) -#define ZCODEC_DEFAULT_COMPRESSION (0x00000006UL) -#define ZCODEC_BEST_COMPRESSION (0x00000009UL) +#define ZCODEC_NO_COMPRESSION (0x00000000UL) +#define ZCODEC_BEST_SPEED (0x00000001UL) +#define ZCODEC_DEFAULT_COMPRESSION (0x00000006UL) +#define ZCODEC_BEST_COMPRESSION (0x00000009UL) -#define ZCODEC_DEFAULT_STRATEGY (0x00000000UL) -#define ZCODEC_ZFILTERED (0x00000100UL) -#define ZCODEC_ZHUFFMAN_ONLY (0x00000200UL) +#define ZCODEC_DEFAULT_STRATEGY (0x00000000UL) +#define ZCODEC_ZFILTERED (0x00000100UL) +#define ZCODEC_ZHUFFMAN_ONLY (0x00000200UL) -#define ZCODEC_UPDATE_CRC (0x00010000UL) -#define ZCODEC_GZ_LIB (0x00020000UL) +#define ZCODEC_UPDATE_CRC (0x00010000UL) +#define ZCODEC_GZ_LIB (0x00020000UL) #define ZCODEC_PNG_DEFAULT ( ZCODEC_NO_COMPRESSION | ZCODEC_DEFAULT_STRATEGY | ZCODEC_UPDATE_CRC ) -#define ZCODEC_DEFAULT ( ZCODEC_DEFAULT_COMPRESSION | ZCODEC_DEFAULT_STRATEGY ) +#define ZCODEC_DEFAULT ( ZCODEC_DEFAULT_COMPRESSION | ZCODEC_DEFAULT_STRATEGY ) // ---------- // - ZCodec - @@ -73,47 +73,47 @@ class TOOLS_DLLPUBLIC ZCodec { private: - ULONG mbInit; - BOOL mbStatus; - BOOL mbFinish; - ULONG mnMemUsage; - SvStream* mpIStm; - BYTE* mpInBuf; - ULONG mnInBufSize; - ULONG mnInToRead; - SvStream* mpOStm; - BYTE* mpOutBuf; - ULONG mnOutBufSize; - - ULONG mnCRC; - ULONG mnCompressMethod; - void* mpsC_Stream; - - void ImplInitBuf( BOOL nIOFlag ); - void ImplWriteBack( void ); - -public: + ULONG mbInit; + BOOL mbStatus; + BOOL mbFinish; + ULONG mnMemUsage; + SvStream* mpIStm; + BYTE* mpInBuf; + ULONG mnInBufSize; + ULONG mnInToRead; + SvStream* mpOStm; + BYTE* mpOutBuf; + ULONG mnOutBufSize; + + ULONG mnCRC; + ULONG mnCompressMethod; + void* mpsC_Stream; + + void ImplInitBuf( BOOL nIOFlag ); + void ImplWriteBack( void ); + +public: ZCodec( ULONG nInBuf, ULONG nOutBuf, ULONG nMemUsage = MAX_MEM_USAGE ); - ZCodec( void ); - virtual ~ZCodec(); + ZCodec( void ); + virtual ~ZCodec(); - virtual void BeginCompression( ULONG nCompressMethod = ZCODEC_DEFAULT ); - virtual long EndCompression(); + virtual void BeginCompression( ULONG nCompressMethod = ZCODEC_DEFAULT ); + virtual long EndCompression(); BOOL IsFinished () const { return mbFinish; } - long Compress( SvStream& rIStm, SvStream& rOStm ); - long Decompress( SvStream& rIStm, SvStream& rOStm ); + long Compress( SvStream& rIStm, SvStream& rOStm ); + long Decompress( SvStream& rIStm, SvStream& rOStm ); - long Write( SvStream& rOStm, const BYTE* pData, ULONG nSize ); - long Read( SvStream& rIStm, BYTE* pData, ULONG nSize ); - long ReadAsynchron( SvStream& rIStm, BYTE* pData, ULONG nSize ); + long Write( SvStream& rOStm, const BYTE* pData, ULONG nSize ); + long Read( SvStream& rIStm, BYTE* pData, ULONG nSize ); + long ReadAsynchron( SvStream& rIStm, BYTE* pData, ULONG nSize ); - void SetBreak( ULONG ); - ULONG GetBreak( void ); - void SetCRC( ULONG nCurrentCRC ); - ULONG UpdateCRC( ULONG nLatestCRC, ULONG nSource ); - ULONG UpdateCRC( ULONG nLatestCRC, BYTE* pSource, long nDatSize ); - ULONG GetCRC(); + void SetBreak( ULONG ); + ULONG GetBreak( void ); + void SetCRC( ULONG nCurrentCRC ); + ULONG UpdateCRC( ULONG nLatestCRC, ULONG nSource ); + ULONG UpdateCRC( ULONG nLatestCRC, BYTE* pSource, long nDatSize ); + ULONG GetCRC(); }; class GZCodec : public ZCodec @@ -122,7 +122,7 @@ class GZCodec : public ZCodec public: GZCodec(){}; ~GZCodec(){}; - virtual void BeginCompression( ULONG nCompressMethod = ZCODEC_DEFAULT ); + virtual void BeginCompression( ULONG nCompressMethod = ZCODEC_DEFAULT ); }; #endif // _ZCODEC_HXX diff --git a/tools/inc/toolsin.hxx b/tools/inc/toolsin.hxx index 5c9bd33eafcb..7259682c9895 100644 --- a/tools/inc/toolsin.hxx +++ b/tools/inc/toolsin.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,10 +41,10 @@ struct Impl1ByteConvertTabData; struct TOOLSINDATA { - ImplRegisterLanguageData* mpFirstLangData; - ImplRegisterFormatData* mpFirstFormatData; - Impl1ByteUnicodeTabData* mpFirstUniTabData; - Impl1ByteConvertTabData* mpFirstConvertTabData; + ImplRegisterLanguageData* mpFirstLangData; + ImplRegisterFormatData* mpFirstFormatData; + Impl1ByteUnicodeTabData* mpFirstUniTabData; + Impl1ByteConvertTabData* mpFirstConvertTabData; }; TOOLSINDATA* ImplGetToolsInData(); diff --git a/tools/os2/inc/dll.hxx b/tools/os2/inc/dll.hxx index 69d92923f509..81a87a03ece7 100644 --- a/tools/os2/inc/dll.hxx +++ b/tools/os2/inc/dll.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/os2/source/dll/toolsdll.cxx b/tools/os2/source/dll/toolsdll.cxx index f4f62e742e7b..0e0bdec3a9b0 100644 --- a/tools/os2/source/dll/toolsdll.cxx +++ b/tools/os2/source/dll/toolsdll.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/qa/test_pathutils.cxx b/tools/qa/test_pathutils.cxx index 3dbe09a6a675..5966406e150f 100644 --- a/tools/qa/test_pathutils.cxx +++ b/tools/qa/test_pathutils.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/qa/version.map b/tools/qa/version.map index f313c44bd7ad..7321bbca16ad 100644 --- a/tools/qa/version.map +++ b/tools/qa/version.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/tools/source/communi/geninfo.cxx b/tools/source/communi/geninfo.cxx index b0878fee159b..97326836de2d 100644 --- a/tools/source/communi/geninfo.cxx +++ b/tools/source/communi/geninfo.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,7 +87,7 @@ BOOL GenericInformation::InsertSubInfo( GenericInformation *pInfo ) } /*****************************************************************************/ -BOOL GenericInformation::InsertSubInfo( const ByteString &rPathKey, const ByteString &rValue, +BOOL GenericInformation::InsertSubInfo( const ByteString &rPathKey, const ByteString &rValue, BOOL bSearchByPath, BOOL bNewPath ) /*****************************************************************************/ { @@ -167,7 +167,7 @@ GenericInformationList::~GenericInformationList() { // delete all Informations stored in this List // ### GH: Hier werden dann wohl etwa die H�lfte der Eintr�ge gel�scht -/* for ( ULONG i = 0; i < Count(); i++ ) { +/* for ( ULONG i = 0; i < Count(); i++ ) { GetObject( i )->ListDeleted(); delete GetObject( i ); Remove( i );*/ @@ -292,7 +292,7 @@ ULONG GenericInformationList::InsertSorted( GenericInformation *pInfo, if ( sCandidate.ToUpperAscii() == sKey ) { // key allready exists in list if ( bOverwrite ) - Replace( pInfo, ULONG(0)); // ### Laut NF scheint hier ein Memory Leak zu sein + Replace( pInfo, ULONG(0)); // ### Laut NF scheint hier ein Memory Leak zu sein return 0; } else if ( sCandidate > sKey ) { @@ -312,7 +312,7 @@ ULONG GenericInformationList::InsertSorted( GenericInformation *pInfo, if ( sCandidate.ToUpperAscii() == sKey ) { // key allready exists in list if ( bOverwrite ) - Replace( pInfo, nActPos ); // ### Laut NF scheint hier ein Memory Leak zu sein + Replace( pInfo, nActPos ); // ### Laut NF scheint hier ein Memory Leak zu sein return nActPos; } @@ -387,7 +387,7 @@ void GenericInformationList::RemoveInfo( GenericInformation *pInfo, Remove( pInfo ); if ( bDelete ) delete pInfo; -/* if ( Count() == 0 && pOwner ) // Leere Listen entfernen; +/* if ( Count() == 0 && pOwner ) // Leere Listen entfernen; { SetOwner( NULL ); delete this; @@ -397,7 +397,7 @@ void GenericInformationList::RemoveInfo( GenericInformation *pInfo, GenericInformation* GenericInformationList::SetOwner( GenericInformation *pNewOwner ) { GenericInformation *pOldOwner = pOwner; - if ( pOwner ) // bei parent austragen; + if ( pOwner ) // bei parent austragen; pOwner->SetSubList( NULL ); if ( pNewOwner ) pNewOwner->SetSubList( this ); diff --git a/tools/source/communi/parser.cxx b/tools/source/communi/parser.cxx index 0160be984dea..20c2bb3ba059 100644 --- a/tools/source/communi/parser.cxx +++ b/tools/source/communi/parser.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -113,8 +113,8 @@ ByteString &InformationParser::ReadLine() if ( nLevel ) { sLine = "}"; fprintf( stdout, "Reached EOF parsing %s. Suplying extra '}'\n",ByteString( sStreamName, gsl_getSystemTextEncoding()).GetBuffer() ); - // nErrorCode = IP_UNEXPECTED_EOF; - // nErrorLine = nActLine; + // nErrorCode = IP_UNEXPECTED_EOF; + // nErrorLine = nActLine; } else sLine = ""; @@ -448,7 +448,7 @@ USHORT InformationParser::GetErrorCode() ByteString &InformationParser::GetErrorText() /*****************************************************************************/ { - // sErrorText = pActStream->GetFileName(); + // sErrorText = pActStream->GetFileName(); sErrorText = ByteString( sStreamName, gsl_getSystemTextEncoding()); sErrorText += ByteString( " (" ); sErrorText += ByteString::CreateFromInt64(nErrorLine); diff --git a/tools/source/datetime/datetime.cxx b/tools/source/datetime/datetime.cxx index b2ef0c11919c..8b679478c535 100644 --- a/tools/source/datetime/datetime.cxx +++ b/tools/source/datetime/datetime.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -337,12 +337,12 @@ DateTime& DateTime::operator +=( double fTimeInDays ) fInt = ::rtl::math::approxFloor( fTimeInDays ); fFrac = fInt >= fTimeInDays ? 0.0 : fTimeInDays - fInt; } - Date::operator+=( long(fInt) ); // full days + Date::operator+=( long(fInt) ); // full days if ( fFrac ) { - Time aTime(0); // default ctor calls system time, we don't need that - fFrac *= 24UL * 60 * 60 * 1000; // time expressed in milliseconds - aTime.MakeTimeFromMS( long(fFrac) ); // method handles negative ms + Time aTime(0); // default ctor calls system time, we don't need that + fFrac *= 24UL * 60 * 60 * 1000; // time expressed in milliseconds + aTime.MakeTimeFromMS( long(fFrac) ); // method handles negative ms operator+=( aTime ); } return *this; @@ -374,7 +374,7 @@ double operator -( const DateTime& rDateTime1, const DateTime& rDateTime2 ) if ( nTime ) { double fTime = double(nTime); - fTime /= 24UL * 60 * 60 * 1000; // convert from milliseconds to fraction + fTime /= 24UL * 60 * 60 * 1000; // convert from milliseconds to fraction if ( nDays < 0 && fTime > 0.0 ) fTime = 1.0 - fTime; return double(nDays) + fTime; diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx index 4853a6b19f57..e6bb4345d9f9 100644 --- a/tools/source/datetime/tdate.cxx +++ b/tools/source/datetime/tdate.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ struct tm *localtime_r(const time_t *timep, struct tm *buffer); static USHORT aDaysInMonth[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; -#define MAX_DAYS 3636532 +#define MAX_DAYS 3636532 // ======================================================================= @@ -102,9 +102,9 @@ long Date::DateToDays( USHORT nDay, USHORT nMonth, USHORT nYear ) static void DaysToDate( long nDays, USHORT& rDay, USHORT& rMonth, USHORT& rYear ) { - long nTempDays; - long i = 0; - BOOL bCalc; + long nTempDays; + long i = 0; + BOOL bCalc; do { @@ -162,12 +162,12 @@ Date::Date() (((ULONG)aDateTime.wMonth)*100) + (((ULONG)aDateTime.wYear)*10000); #else - time_t nTmpTime; + time_t nTmpTime; struct tm aTime; // Zeit ermitteln nTmpTime = time( 0 ); - + // Datum zusammenbauen if ( localtime_r( &nTmpTime, &aTime ) ) { @@ -194,8 +194,8 @@ void Date::SetDay( USHORT nNewDay ) void Date::SetMonth( USHORT nNewMonth ) { - ULONG nDay = GetDay(); - ULONG nYear = GetYear(); + ULONG nDay = GetDay(); + ULONG nYear = GetYear(); nDate = nDay + (((ULONG)(nNewMonth%100))*100) + (nYear*10000); } @@ -204,8 +204,8 @@ void Date::SetMonth( USHORT nNewMonth ) void Date::SetYear( USHORT nNewYear ) { - ULONG nDay = GetDay(); - ULONG nMonth = GetMonth(); + ULONG nDay = GetDay(); + ULONG nMonth = GetMonth(); nDate = nDay + (nMonth*100) + (((ULONG)(nNewYear%10000))*10000); } @@ -304,12 +304,12 @@ USHORT Date::GetWeekOfYear( DayOfWeek eStartDay, if ( nWeek == 53 ) { // naechster x_Sonntag == erster x_Sonntag im neuen Jahr - // == noch gleiche Woche + // == noch gleiche Woche long nTempDays = DateToDays( GetDay(), GetMonth(), GetYear() ); nTempDays += 6 - (GetDayOfWeek()+(7-(short)eStartDay)) % 7; - USHORT nDay; - USHORT nMonth; - USHORT nYear; + USHORT nDay; + USHORT nMonth; + USHORT nYear; DaysToDate( nTempDays, nDay, nMonth, nYear ); nWeek = Date( nDay, nMonth, nYear ).GetWeekOfYear( eStartDay, nMinimumNumberOfDaysInWeek ); } @@ -363,10 +363,10 @@ BOOL Date::IsValid() const Date& Date::operator +=( long nDays ) { - USHORT nDay; - USHORT nMonth; - USHORT nYear; - long nTempDays = DateToDays( GetDay(), GetMonth(), GetYear() ); + USHORT nDay; + USHORT nMonth; + USHORT nYear; + long nTempDays = DateToDays( GetDay(), GetMonth(), GetYear() ); nTempDays += nDays; if ( nTempDays > MAX_DAYS ) @@ -386,10 +386,10 @@ Date& Date::operator +=( long nDays ) Date& Date::operator -=( long nDays ) { - USHORT nDay; - USHORT nMonth; - USHORT nYear; - long nTempDays = DateToDays( GetDay(), GetMonth(), GetYear() ); + USHORT nDay; + USHORT nMonth; + USHORT nYear; + long nTempDays = DateToDays( GetDay(), GetMonth(), GetYear() ); nTempDays -= nDays; if ( nTempDays > MAX_DAYS ) @@ -409,10 +409,10 @@ Date& Date::operator -=( long nDays ) Date& Date::operator ++() { - USHORT nDay; - USHORT nMonth; - USHORT nYear; - long nTempDays = DateToDays( GetDay(), GetMonth(), GetYear() ); + USHORT nDay; + USHORT nMonth; + USHORT nYear; + long nTempDays = DateToDays( GetDay(), GetMonth(), GetYear() ); if ( nTempDays < MAX_DAYS ) { @@ -428,10 +428,10 @@ Date& Date::operator ++() Date& Date::operator --() { - USHORT nDay; - USHORT nMonth; - USHORT nYear; - long nTempDays = DateToDays( GetDay(), GetMonth(), GetYear() ); + USHORT nDay; + USHORT nMonth; + USHORT nYear; + long nTempDays = DateToDays( GetDay(), GetMonth(), GetYear() ); if ( nTempDays > 1 ) { diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx index 20d499da8b11..9483cc10065e 100644 --- a/tools/source/datetime/ttime.cxx +++ b/tools/source/datetime/ttime.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,13 +66,13 @@ static sal_Int32 TimeToSec100( const Time& rTime ) sal_Int32 nSec = rTime.GetSec(); sal_Int32 n100Sec = rTime.Get100Sec(); -// Wegen Interal Compiler Error bei MSC, etwas komplizierter -// return (n100Sec + (nSec*100) + (nMin*60*100) + (nHour*60*60*100) * nSign); +// Wegen Interal Compiler Error bei MSC, etwas komplizierter +// return (n100Sec + (nSec*100) + (nMin*60*100) + (nHour*60*60*100) * nSign); sal_Int32 nRet = n100Sec; - nRet += nSec*100; - nRet += nMin*60*100; - nRet += nHour*60*60*100; + nRet += nSec*100; + nRet += nMin*60*100; + nRet += nHour*60*60*100; return (nRet * nSign); } @@ -118,7 +118,7 @@ Time::Time() (((sal_Int32)aDateTime.wSecond)*100) + ((sal_Int32)aDateTime.wMilliseconds/10); #else - time_t nTmpTime; + time_t nTmpTime; struct tm aTime; // Zeit ermitteln @@ -148,12 +148,12 @@ Time::Time( const Time& rTime ) Time::Time( ULONG nHour, ULONG nMin, ULONG nSec, ULONG n100Sec ) { // Zeit normalisieren - nSec += n100Sec / 100; + nSec += n100Sec / 100; n100Sec = n100Sec % 100; - nMin += nSec / 60; - nSec = nSec % 60; - nHour += nMin / 60; - nMin = nMin % 60; + nMin += nSec / 60; + nSec = nSec % 60; + nHour += nMin / 60; + nMin = nMin % 60; // Zeit zusammenbauen nTime = (sal_Int32)(n100Sec + (nSec*100) + (nMin*10000) + (nHour*1000000)); @@ -163,10 +163,10 @@ Time::Time( ULONG nHour, ULONG nMin, ULONG nSec, ULONG n100Sec ) void Time::SetHour( USHORT nNewHour ) { - short nSign = (nTime >= 0) ? +1 : -1; - sal_Int32 nMin = GetMin(); - sal_Int32 nSec = GetSec(); - sal_Int32 n100Sec = Get100Sec(); + short nSign = (nTime >= 0) ? +1 : -1; + sal_Int32 nMin = GetMin(); + sal_Int32 nSec = GetSec(); + sal_Int32 n100Sec = Get100Sec(); nTime = (n100Sec + (nSec*100) + (nMin*10000) + (((sal_Int32)nNewHour)*1000000)) * nSign; @@ -176,10 +176,10 @@ void Time::SetHour( USHORT nNewHour ) void Time::SetMin( USHORT nNewMin ) { - short nSign = (nTime >= 0) ? +1 : -1; - sal_Int32 nHour = GetHour(); - sal_Int32 nSec = GetSec(); - sal_Int32 n100Sec = Get100Sec(); + short nSign = (nTime >= 0) ? +1 : -1; + sal_Int32 nHour = GetHour(); + sal_Int32 nSec = GetSec(); + sal_Int32 n100Sec = Get100Sec(); // kein Ueberlauf nNewMin = nNewMin % 60; @@ -192,10 +192,10 @@ void Time::SetMin( USHORT nNewMin ) void Time::SetSec( USHORT nNewSec ) { - short nSign = (nTime >= 0) ? +1 : -1; - sal_Int32 nHour = GetHour(); - sal_Int32 nMin = GetMin(); - sal_Int32 n100Sec = Get100Sec(); + short nSign = (nTime >= 0) ? +1 : -1; + sal_Int32 nHour = GetHour(); + sal_Int32 nMin = GetMin(); + sal_Int32 n100Sec = Get100Sec(); // kein Ueberlauf nNewSec = nNewSec % 60; @@ -208,10 +208,10 @@ void Time::SetSec( USHORT nNewSec ) void Time::Set100Sec( USHORT nNew100Sec ) { - short nSign = (nTime >= 0) ? +1 : -1; - sal_Int32 nHour = GetHour(); - sal_Int32 nMin = GetMin(); - sal_Int32 nSec = GetSec(); + short nSign = (nTime >= 0) ? +1 : -1; + sal_Int32 nHour = GetHour(); + sal_Int32 nMin = GetMin(); + sal_Int32 nSec = GetSec(); // kein Ueberlauf nNew100Sec = nNew100Sec % 100; @@ -224,11 +224,11 @@ void Time::Set100Sec( USHORT nNew100Sec ) sal_Int32 Time::GetMSFromTime() const { - short nSign = (nTime >= 0) ? +1 : -1; - sal_Int32 nHour = GetHour(); - sal_Int32 nMin = GetMin(); - sal_Int32 nSec = GetSec(); - sal_Int32 n100Sec = Get100Sec(); + short nSign = (nTime >= 0) ? +1 : -1; + sal_Int32 nHour = GetHour(); + sal_Int32 nMin = GetMin(); + sal_Int32 nSec = GetSec(); + sal_Int32 n100Sec = Get100Sec(); return (((nHour*3600000)+(nMin*60000)+(nSec*1000)+(n100Sec*10))*nSign); } @@ -254,7 +254,7 @@ void Time::MakeTimeFromMS( sal_Int32 nMS ) double Time::GetTimeInDays() const { - short nSign = (nTime >= 0) ? +1 : -1; + short nSign = (nTime >= 0) ? +1 : -1; double nHour = GetHour(); double nMin = GetMin(); double nSec = GetSec(); @@ -335,7 +335,7 @@ Time Time::GetUTCOffset() else return Time( 0 ); #elif defined( WNT ) - TIME_ZONE_INFORMATION aTimeZone; + TIME_ZONE_INFORMATION aTimeZone; aTimeZone.Bias = 0; DWORD nTimeZoneRet = GetTimeZoneInformation( &aTimeZone ); sal_Int32 nTempTime = aTimeZone.Bias; @@ -348,18 +348,18 @@ Time Time::GetUTCOffset() aTime = -aTime; return aTime; #else - static ULONG nCacheTicks = 0; - static sal_Int32 nCacheSecOffset = -1; - ULONG nTicks = Time::GetSystemTicks(); - time_t nTime; - tm aTM; - sal_Int32 nLocalTime; - sal_Int32 nUTC; - short nTempTime; + static ULONG nCacheTicks = 0; + static sal_Int32 nCacheSecOffset = -1; + ULONG nTicks = Time::GetSystemTicks(); + time_t nTime; + tm aTM; + sal_Int32 nLocalTime; + sal_Int32 nUTC; + short nTempTime; // Evt. Wert neu ermitteln - if ( (nCacheSecOffset == -1) || - ((nTicks - nCacheTicks) > 360000) || + if ( (nCacheSecOffset == -1) || + ((nTicks - nCacheTicks) > 360000) || ( nTicks < nCacheTicks ) // handle overflow ) { @@ -424,16 +424,16 @@ ULONG Time::GetProcessTicks() DosQuerySysInfo( QSV_MS_COUNT, QSV_MS_COUNT, &nClock, sizeof( nClock ) ); return (ULONG)nClock; #else - static ULONG nImplTicksPerSecond = 0; - static double dImplTicksPerSecond; - static double dImplTicksULONGMAX; - ULONG nTicks = (ULONG)clock(); + static ULONG nImplTicksPerSecond = 0; + static double dImplTicksPerSecond; + static double dImplTicksULONGMAX; + ULONG nTicks = (ULONG)clock(); if ( !nImplTicksPerSecond ) { nImplTicksPerSecond = CLOCKS_PER_SEC; dImplTicksPerSecond = nImplTicksPerSecond; - dImplTicksULONGMAX = (double)(ULONG)ULONG_MAX; + dImplTicksULONGMAX = (double)(ULONG)ULONG_MAX; } double fTicks = nTicks; diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx index 7de3195d82af..ab1f414b0972 100644 --- a/tools/source/debug/debug.cxx +++ b/tools/source/debug/debug.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1206,7 +1206,7 @@ void* DbgFunc( USHORT nAction, void* pParam ) case DBG_FUNC_SAVEDATA: { const DbgData* pData = static_cast< const DbgData* >( pParam ); - + sal_Char aBuf[ 4096 ]; DbgGetDbgFileName( aBuf, sizeof( aBuf ) ); FILETYPE pIniFile = FileOpen( aBuf, "w" ); diff --git a/tools/source/debug/stcktree.cxx b/tools/source/debug/stcktree.cxx index 9a8601e178df..dccc4c198852 100644 --- a/tools/source/debug/stcktree.cxx +++ b/tools/source/debug/stcktree.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,32 +38,32 @@ struct ImpDbgStackTree { - ImpDbgStackTree* pLeft_; - ImpDbgStackTree* pRight_; - ImpDbgStackTree* pCaller_; - ImpDbgStackTree* pSub_; - ULONG nIP_; - ULONG nBytesLeak_; - ULONG nBytesPeak_; - ULONG nBytes_; - ULONG nCountLeak_; - ULONG nCountPeak_; - ULONG nCount_; - ULONG nMax_; - ULONG nMin_; + ImpDbgStackTree* pLeft_; + ImpDbgStackTree* pRight_; + ImpDbgStackTree* pCaller_; + ImpDbgStackTree* pSub_; + ULONG nIP_; + ULONG nBytesLeak_; + ULONG nBytesPeak_; + ULONG nBytes_; + ULONG nCountLeak_; + ULONG nCountPeak_; + ULONG nCount_; + ULONG nMax_; + ULONG nMin_; ImpDbgStackTree( ImpDbgStackTree* pSub, ULONG nIP ); ~ImpDbgStackTree(); - ImpDbgStackTree* Add( ULONG nAlloc, ULONG* pBP, ULONG nIP ); - void Print( int nLevel, ULONG nCount, ULONG nCountLeak ); - void Print( int nLevel ); + ImpDbgStackTree* Add( ULONG nAlloc, ULONG* pBP, ULONG nIP ); + void Print( int nLevel, ULONG nCount, ULONG nCountLeak ); + void Print( int nLevel ); }; -static ImpDbgStackTree* pImpDbgStackTreeRoot = NULL; -static ULONG* pImpDbgStackTreeBP = NULL; -static ULONG nImpDbgStackTreeMain = 0; -static int nImpDbgStackTreeSem = 0; +static ImpDbgStackTree* pImpDbgStackTreeRoot = NULL; +static ULONG* pImpDbgStackTreeBP = NULL; +static ULONG nImpDbgStackTreeMain = 0; +static int nImpDbgStackTreeSem = 0; // ----------------------------------------------------------------------- @@ -156,7 +156,7 @@ ImpDbgStackTree* ImpDbgStackTree::Add( ULONG nAlloc, ULONG *pBP, ULONG nIP ) nCountLeak_++; if ( nCountLeak_ > nCountPeak_ ) nCountPeak_ = nCountLeak_; - nBytes_ += nAlloc; + nBytes_ += nAlloc; nBytesLeak_ += nAlloc; if ( nBytesLeak_ > nBytesPeak_ ) nBytesPeak_ = nBytesLeak_; @@ -193,7 +193,7 @@ void DbgStartStackTree() ULONG* pBP; __asm mov pBP, ebp; - pImpDbgStackTreeBP = (ULONG*)pBP[0]; + pImpDbgStackTreeBP = (ULONG*)pBP[0]; nImpDbgStackTreeMain = pImpDbgStackTreeBP[1]; } } @@ -277,8 +277,8 @@ void DbgFreeStackTree( void* pVoid, ULONG nAlloc ) { if ( p->nBytesLeak_ > p->nMax_ * p->nCountLeak_ ) { - nAlloc += p->nBytesLeak_ - p->nMax_ * p->nCountLeak_; - p->nBytesLeak_ = p->nMax_ * p->nCountLeak_; + nAlloc += p->nBytesLeak_ - p->nMax_ * p->nCountLeak_; + p->nBytesLeak_ = p->nMax_ * p->nCountLeak_; } } diff --git a/tools/source/fsys/comdep.cxx b/tools/source/fsys/comdep.cxx index a4cfca226547..fa1009ad5fd3 100644 --- a/tools/source/fsys/comdep.cxx +++ b/tools/source/fsys/comdep.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/source/fsys/comdep.hxx b/tools/source/fsys/comdep.hxx index 54f9df8d9298..043c5815f764 100644 --- a/tools/source/fsys/comdep.hxx +++ b/tools/source/fsys/comdep.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,17 +68,17 @@ char *volumeid( const char* pPfad ); struct DirReader_Impl { - Dir* pDir; + Dir* pDir; DIR* pDosDir; dirent* pDosEntry; DirEntry* pParent; - String aPath; + String aPath; ByteString aBypass; BOOL bReady; - BOOL bInUse; + BOOL bInUse; DirReader_Impl( Dir &rDir ) - : pDir( &rDir ), + : pDir( &rDir ), pDosEntry( 0 ), pParent( 0 ), aPath( GUI2FSYS(rDir.GetFull()) ), @@ -119,18 +119,18 @@ struct DirReader_Impl struct FileCopier_Impl { - FSysAction nActions; // was zu tun ist (Copy/Move/recur) - Link aErrorLink; // bei Fehlern zu rufen - ErrCode eErr; // aktueller Fehlercode im Error-Handler - const DirEntry* pErrSource; // fuer Error-Handler falls Source-Fehler - const DirEntry* pErrTarget; // fuer Error-Handler falls Target-Fehler + FSysAction nActions; // was zu tun ist (Copy/Move/recur) + Link aErrorLink; // bei Fehlern zu rufen + ErrCode eErr; // aktueller Fehlercode im Error-Handler + const DirEntry* pErrSource; // fuer Error-Handler falls Source-Fehler + const DirEntry* pErrTarget; // fuer Error-Handler falls Target-Fehler FileCopier_Impl() - : nActions( 0 ), eErr( 0 ), + : nActions( 0 ), eErr( 0 ), pErrSource( 0 ), pErrTarget( 0 ) {} FileCopier_Impl( const FileCopier_Impl &rOrig ) - : nActions( rOrig.nActions ), eErr( 0 ), + : nActions( rOrig.nActions ), eErr( 0 ), pErrSource( 0 ), pErrTarget( 0 ) {} @@ -147,10 +147,10 @@ struct FileCopier_Impl #if defined WNT || defined OS2 BOOL IsRedirectable_Impl( const ByteString &rPath ); #else -#define IsRedirectable_Impl( rPath ) TRUE +#define IsRedirectable_Impl( rPath ) TRUE #endif //-------------------------------------------------------------------- - + #endif diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index 456e0aadbc9d..1bd43bffc4e7 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -547,7 +547,7 @@ FSysError DirEntry::ImpParseOs2Name( const ByteString& rPfad, FSysPathStyle eSty FSysError DirEntry::ImpParseName( const ByteString& rbInitName, FSysPathStyle eStyle ) { - String rInitName( rbInitName, osl_getThreadTextEncoding() ); + String rInitName( rbInitName, osl_getThreadTextEncoding() ); if ( eStyle == FSYS_STYLE_HOST ) eStyle = DEFSTYLE; diff --git a/tools/source/fsys/filecopy.cxx b/tools/source/fsys/filecopy.cxx index 104ab0cd6d9a..62d361aa4af4 100644 --- a/tools/source/fsys/filecopy.cxx +++ b/tools/source/fsys/filecopy.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,10 +73,10 @@ using namespace ::osl; FileCopier::FileCopier() : - nBytesTotal ( 0 ), + nBytesTotal ( 0 ), nBytesCopied( 0 ), - nBlockSize ( 4096 ), - pImp ( new FileCopier_Impl ) + nBlockSize ( 4096 ), + pImp ( new FileCopier_Impl ) { } @@ -85,12 +85,12 @@ FileCopier::FileCopier() : FileCopier::FileCopier( const DirEntry& rSource, const DirEntry& rTarget ) : - aSource ( rSource ), - aTarget ( rTarget ), - nBytesTotal ( 0 ), + aSource ( rSource ), + aTarget ( rTarget ), + nBytesTotal ( 0 ), nBytesCopied( 0 ), - nBlockSize ( 4096 ), - pImp ( new FileCopier_Impl ) + nBlockSize ( 4096 ), + pImp ( new FileCopier_Impl ) { } @@ -99,13 +99,13 @@ FileCopier::FileCopier( const DirEntry& rSource, const DirEntry& rTarget ) : FileCopier::FileCopier( const FileCopier& rCopier ) : - aSource ( rCopier.aSource ), - aTarget ( rCopier.aTarget ), - nBytesTotal ( 0 ), - nBytesCopied ( 0 ), - aProgressLink ( rCopier.aProgressLink ), - nBlockSize ( 4096 ), - pImp ( new FileCopier_Impl ) + aSource ( rCopier.aSource ), + aTarget ( rCopier.aTarget ), + nBytesTotal ( 0 ), + nBytesCopied ( 0 ), + aProgressLink ( rCopier.aProgressLink ), + nBlockSize ( 4096 ), + pImp ( new FileCopier_Impl ) { } @@ -412,10 +412,10 @@ FSysError FileCopier::DoCopy_Impl( if ( FSYS_ERR_OK == ERRCODE_TOERROR(eRet) ) { - WIN32_FIND_DATA fdSource; + WIN32_FIND_DATA fdSource; ByteString aFullSource(aSource.GetFull(), osl_getThreadTextEncoding()); ByteString aFullTarget(aTgt.GetFull(), osl_getThreadTextEncoding()); - HANDLE hFind = FindFirstFile( aFullSource.GetBuffer() , &fdSource ); + HANDLE hFind = FindFirstFile( aFullSource.GetBuffer() , &fdSource ); if ( hFind != INVALID_HANDLE_VALUE ) { FindClose( hFind ); diff --git a/tools/source/fsys/fstat.cxx b/tools/source/fsys/fstat.cxx index 41bd37fa5f2f..acdbe6bae510 100644 --- a/tools/source/fsys/fstat.cxx +++ b/tools/source/fsys/fstat.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ *************************************************************************/ FileStat::FileStat() -: // don't use Default-Ctors! +: // don't use Default-Ctors! aDateCreated( ULONG(0) ), aTimeCreated( ULONG(0) ), aDateModified( ULONG(0) ), @@ -78,7 +78,7 @@ FileStat::FileStat() *************************************************************************/ FileStat::FileStat( const DirEntry& rDirEntry, FSysAccess nAccess ) -: // don't use Default-Ctors! +: // don't use Default-Ctors! aDateCreated( ULONG(0) ), aTimeCreated( ULONG(0) ), aDateModified( ULONG(0) ), @@ -287,7 +287,7 @@ ULONG FileStat::SetReadOnlyFlag( const DirEntry &rEntry, BOOL bRO ) |* |* FileStat::SetDateTime |* -|* Ersterstellung PB 27.06.97 +|* Ersterstellung PB 27.06.97 |* Letzte Aenderung |* *************************************************************************/ @@ -319,28 +319,28 @@ void FileStat::SetDateTime( const String& rFileName, if ( nDiff > 0 ) { - aNewTime += aDiff; // Stundenkorrektur + aNewTime += aDiff; // Stundenkorrektur // bei "Uberlauf korrigieren if ( aNewTime >= Time( 24, 0 ) ) aNewTime -= Time( 24, 0 ); // Tages"uberlauf? - if ( aOldTime == Time( 0, 0 ) || // 00:00 -> 01:00 - aNewTime < aOldTime ) // 23:00 -> 00:00 | 01:00 ... + if ( aOldTime == Time( 0, 0 ) || // 00:00 -> 01:00 + aNewTime < aOldTime ) // 23:00 -> 00:00 | 01:00 ... aNewDate++; } else if ( nDiff < 0 ) { - aNewTime -= aDiff; // Stundenkorrektur + aNewTime -= aDiff; // Stundenkorrektur // negative Zeit (-1:00) korrigieren: 23:00 if (aNewTime < Time( 0, 0 ) ) aNewTime += Time( 24, 0 ); // Tagesunterlauf ? - if ( aOldTime == Time( 0, 0 ) || // 00:00 -> 23:00 - aNewTime > aOldTime ) // 01:00 -> 23:00 | 22:00 ... + if ( aOldTime == Time( 0, 0 ) || // 00:00 -> 23:00 + aNewTime > aOldTime ) // 01:00 -> 23:00 | 22:00 ... aNewDate--; } } @@ -371,10 +371,10 @@ void FileStat::SetDateTime( const String& rFileName, // open file ULONG nAction = FILE_EXISTED; HFILE hFile = 0; - ULONG nFlags = OPEN_FLAGS_WRITE_THROUGH | - OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NO_CACHE | - OPEN_FLAGS_RANDOM | OPEN_FLAGS_NOINHERIT | - OPEN_SHARE_DENYNONE | OPEN_ACCESS_READWRITE; + ULONG nFlags = OPEN_FLAGS_WRITE_THROUGH | + OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NO_CACHE | + OPEN_FLAGS_RANDOM | OPEN_FLAGS_NOINHERIT | + OPEN_SHARE_DENYNONE | OPEN_ACCESS_READWRITE; APIRET nRet = DosOpen((PSZ)aFileName.GetBuffer(), &hFile, (PULONG)&nAction, 0/*size*/, FILE_NORMAL, diff --git a/tools/source/fsys/os2.cxx b/tools/source/fsys/os2.cxx index d34c389dc8e6..03f8f9eb46ce 100644 --- a/tools/source/fsys/os2.cxx +++ b/tools/source/fsys/os2.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -182,7 +182,7 @@ BOOL DirEntry::ToAbs() String DirEntry::GetVolume() const { DBG_CHKTHIS( DirEntry, ImpCheckDirEntry ); - + String aRet; const DirEntry *pTop = ImpGetTopPtr(); ByteString aName = ByteString( pTop->aName ).ToLowerAscii(); @@ -327,7 +327,7 @@ USHORT DirReader_Impl::Init() sDrive[0] = c; sRoot[0] = c; DirEntry* pDrive = new DirEntry( sDrive, FSYS_FLAG_VOLUME, FSYS_STYLE_HOST ); - if ( pDir->aNameMask.Matches( String( ByteString(sDrive), osl_getThreadTextEncoding())) + if ( pDir->aNameMask.Matches( String( ByteString(sDrive), osl_getThreadTextEncoding())) && aDriveMap[c-'a'].nKind != FSYS_KIND_UNKNOWN ) { if ( pDir->pStatLst ) //Status fuer Sort gewuenscht? @@ -375,8 +375,8 @@ USHORT DirReader_Impl::Read() { DirEntryFlag eFlag = 0 == strcmp( pDosEntry->d_name, "." ) ? FSYS_FLAG_CURRENT - : 0 == strcmp( pDosEntry->d_name, ".." ) ? FSYS_FLAG_PARENT - : FSYS_FLAG_NORMAL; + : 0 == strcmp( pDosEntry->d_name, ".." ) ? FSYS_FLAG_PARENT + : FSYS_FLAG_NORMAL; DirEntry *pTemp = new DirEntry( ByteString(pDosEntry->d_name), eFlag, FSYS_STYLE_UNX ); if ( pParent ) pTemp->ImpChangeParent( new DirEntry( *pParent ), FALSE); @@ -716,7 +716,7 @@ void CreateCaseMapImpl() // build a string starting with code 0 as first character upto 255 char sTemp[256]; USHORT n; - + for ( n = 0; n < 256; ++n ) sTemp[n] = (char) n; @@ -785,10 +785,10 @@ void CreateDriveMapImpl() aDriveMap[2].nKind = FSYS_KIND_FIXED; aDriveMap[2].nStyle = FSYS_STYLE_FAT; #else - FSQBUFFER_ aBuf; + FSQBUFFER_ aBuf; ULONG nBufLen; APIRET nRet; - USHORT nDrive; + USHORT nDrive; // disable error-boxes for hard-errors DosError(FERR_DISABLEHARDERR); @@ -932,7 +932,7 @@ FSysPathStyle DirEntry::GetPathStyle( const String &rDevice ) |* |* Beschreibung |* Ersterstellung TPF 26.02.1999 -|* Letzte Aenderung +|* Letzte Aenderung |* *************************************************************************/ @@ -940,7 +940,7 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const { if (eFormatter==FSYS_STYLE_HOST) { - if (GetPathStyle(GetDevice().GetName()) == FSYS_STYLE_UNX) + if (GetPathStyle(GetDevice().GetName()) == FSYS_STYLE_UNX) { return TRUE; } @@ -951,7 +951,7 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const } else { - BOOL isCaseSensitive = FALSE; // ich bin unter OS2, also ist der default im Zweifelsfall case insensitiv + BOOL isCaseSensitive = FALSE; // ich bin unter OS2, also ist der default im Zweifelsfall case insensitiv switch ( eFormatter ) { case FSYS_STYLE_MAC: @@ -973,7 +973,7 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const } default: { - isCaseSensitive = FALSE; // ich bin unter OS2, also ist der default im Zweifelsfall case insensitiv + isCaseSensitive = FALSE; // ich bin unter OS2, also ist der default im Zweifelsfall case insensitiv break; } } diff --git a/tools/source/fsys/os2.hxx b/tools/source/fsys/os2.hxx index e4315b7ffa8f..c5e54ba0ad47 100644 --- a/tools/source/fsys/os2.hxx +++ b/tools/source/fsys/os2.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ String ToLowerImpl( const String& ); #define DEFSTYLE FSYS_STYLE_OS2 #define MKDIR( p ) mkdir( (unsigned char*) p ) -#define CMP_LOWER(s) ( s.ToLowerAscii() ) +#define CMP_LOWER(s) ( s.ToLowerAscii() ) #define START_DRV 'a' diff --git a/tools/source/fsys/tdir.cxx b/tools/source/fsys/tdir.cxx index 0b947304007b..b6bf48a8cdf9 100644 --- a/tools/source/fsys/tdir.cxx +++ b/tools/source/fsys/tdir.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -322,7 +322,7 @@ void Dir::Reset() else pLst = new DirEntryList(); - // Alte File-Stat's Loeschen + // Alte File-Stat's Loeschen if ( pStatLst ) { //Erstmal die alten Loeschen @@ -601,7 +601,7 @@ FSysError Dir::ImpSetSort( std::va_list pArgs, int nFirstSort ) } while ( !bLast ); va_end( pArgs ); - delete pSort; // JP:6.3.00 - delete the initial pointer + delete pSort; // JP:6.3.00 - delete the initial pointer //Enfernen der alten Sort-Elemente if ( pSortLst ) diff --git a/tools/source/fsys/tempfile.cxx b/tools/source/fsys/tempfile.cxx index c5f0b222a1c5..b3f53d882467 100644 --- a/tools/source/fsys/tempfile.cxx +++ b/tools/source/fsys/tempfile.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx index 8f0923b5fe88..13da80f6ccca 100644 --- a/tools/source/fsys/unx.cxx +++ b/tools/source/fsys/unx.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ #include <sys/mntctl.h> #include <sys/vmount.h> extern "C" int mntctl( int cmd, size_t size, char* buf ); -#elif defined(NETBSD) +#elif defined(NETBSD) #include <sys/mount.h> #elif defined(FREEBSD) || defined(MACOSX) #elif defined DECUNIX @@ -71,11 +71,11 @@ DECLARE_LIST( FileStatList, FileStat* ) #if defined SOLARIS || defined SINIX #define MOUNTSPECIAL mnt_special -#define MOUNTPOINT mnt_mountp +#define MOUNTPOINT mnt_mountp #define MOUNTOPTS mnt_mntopts #define MOUNTFS mnt_fstype #elif defined SCO -#define MNTTAB "/etc/mnttab" +#define MNTTAB "/etc/mnttab" #define MOUNTSPECIAL mt_dev #define MOUNTPOINT mt_filsys #else @@ -181,29 +181,29 @@ static BOOL GetMountEntry(dev_t dev, struct mymnttab *mytab) if ((stat (mnt->MOUNTPOINT, &buf) == -1) || (buf.st_dev != dev)) continue; } -# ifdef LINUX +# ifdef LINUX /* #61624# File mit setmntent oeffnen und mit fclose schliessen stoesst bei der glibc-2.1 auf wenig Gegenliebe */ endmntent( fp ); -# else +# else fclose (fp); -# endif +# endif mytab->mountspecial = mnt->MOUNTSPECIAL; - mytab->mountpoint = mnt->MOUNTPOINT; - mytab->mountdevice = dev; + mytab->mountpoint = mnt->MOUNTPOINT; + mytab->mountdevice = dev; #ifndef SCO mytab->mymnttab_filesystem = mnt->MOUNTFS; #else - mytab->mymnttab_filesystem = "ext2"; //default ist case sensitiv unter unix + mytab->mymnttab_filesystem = "ext2"; //default ist case sensitiv unter unix #endif return TRUE; } -# ifdef LINUX +# ifdef LINUX /* #61624# dito */ endmntent( fp ); -# else +# else fclose (fp); -# endif +# endif return FALSE; } @@ -213,7 +213,7 @@ static BOOL GetMountEntry(dev_t dev, struct mymnttab *mytab) |* |* DirEntry::IsCaseSensitive() |* -|* Beschreibung +|* Beschreibung |* Ersterstellung TPF 25.02.1999 |* Letzte Aenderung TPF 25.02.1999 |* @@ -235,7 +235,7 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const { if (aPath.Level() == 1) { - return TRUE; // ich bin unter UNIX, also ist der default im Zweifelsfall case sensitiv + return TRUE; // ich bin unter UNIX, also ist der default im Zweifelsfall case sensitiv } aPath = aPath [1]; } @@ -246,7 +246,7 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const (fsmnt.mymnttab_filesystem.CompareTo("umsdos")==COMPARE_EQUAL) || (fsmnt.mymnttab_filesystem.CompareTo("vfat")==COMPARE_EQUAL) || (fsmnt.mymnttab_filesystem.CompareTo("hpfs")==COMPARE_EQUAL) || - (fsmnt.mymnttab_filesystem.CompareTo("smb") ==COMPARE_EQUAL) || + (fsmnt.mymnttab_filesystem.CompareTo("smb") ==COMPARE_EQUAL) || (fsmnt.mymnttab_filesystem.CompareTo("ncpfs")==COMPARE_EQUAL)) { return FALSE; @@ -259,7 +259,7 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const } else { - BOOL isCaseSensitive = TRUE; // ich bin unter UNIX, also ist der default im Zweifelsfall case sensitiv + BOOL isCaseSensitive = TRUE; // ich bin unter UNIX, also ist der default im Zweifelsfall case sensitiv switch ( eFormatter ) { case FSYS_STYLE_MAC: @@ -281,7 +281,7 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const } default: { - isCaseSensitive = TRUE; // ich bin unter UNIX, also ist der default im Zweifelsfall case sensitiv + isCaseSensitive = TRUE; // ich bin unter UNIX, also ist der default im Zweifelsfall case sensitiv break; } } @@ -343,8 +343,8 @@ String DirEntry::GetVolume() const } mymnttab &rMnt = mymnt::get(); return ((buf.st_dev == rMnt.mountdevice || - GetMountEntry(buf.st_dev, &rMnt)) ? - String(rMnt.mountspecial, osl_getThreadTextEncoding()) : + GetMountEntry(buf.st_dev, &rMnt)) ? + String(rMnt.mountspecial, osl_getThreadTextEncoding()) : String()); } @@ -364,8 +364,8 @@ DirEntry DirEntry::GetDevice() const } mymnttab &rMnt = mymnt::get(); return ((buf.st_dev == rMnt.mountdevice || - GetMountEntry(buf.st_dev, &rMnt)) ? - String( rMnt.mountpoint, osl_getThreadTextEncoding()) : + GetMountEntry(buf.st_dev, &rMnt)) ? + String( rMnt.mountpoint, osl_getThreadTextEncoding()) : String()); } @@ -433,8 +433,8 @@ USHORT DirReader_Impl::Read() { DirEntryFlag eFlag = 0 == strcmp( pDosEntry->d_name, "." ) ? FSYS_FLAG_CURRENT - : 0 == strcmp( pDosEntry->d_name, ".." ) ? FSYS_FLAG_PARENT - : FSYS_FLAG_NORMAL; + : 0 == strcmp( pDosEntry->d_name, ".." ) ? FSYS_FLAG_PARENT + : FSYS_FLAG_NORMAL; DirEntry *pTemp = new DirEntry( ByteString(pDosEntry->d_name), eFlag, FSYS_STYLE_UNX ); if ( pParent ) pTemp->ImpChangeParent( new DirEntry( *pParent ), FALSE); @@ -608,7 +608,7 @@ FSysPathStyle DirEntry::GetPathStyle( const String & ) |* |* FileStat::SetDateTime |* -|* Ersterstellung PB 27.06.97 +|* Ersterstellung PB 27.06.97 |* Letzte Aenderung |* *************************************************************************/ @@ -618,8 +618,8 @@ void FileStat::SetDateTime( const String& rFileName, { tm times; - times.tm_year = rNewDateTime.GetYear() - 1900; // 1997 -> 97 - times.tm_mon = rNewDateTime.GetMonth() - 1; // 0 == Januar! + times.tm_year = rNewDateTime.GetYear() - 1900; // 1997 -> 97 + times.tm_mon = rNewDateTime.GetMonth() - 1; // 0 == Januar! times.tm_mday = rNewDateTime.GetDay(); times.tm_hour = rNewDateTime.GetHour(); diff --git a/tools/source/fsys/unx.hxx b/tools/source/fsys/unx.hxx index 0ecef8df7892..b6723e8709a3 100644 --- a/tools/source/fsys/unx.hxx +++ b/tools/source/fsys/unx.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ #define DEFSTYLE FSYS_STYLE_BSD #endif -#define CMP_LOWER(s) (s) +#define CMP_LOWER(s) (s) #define TEMPNAME() tmpnam(0) #define LOWER(aString) (aString.Lower()) diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 50dacd93ed81..b9c4941aa155 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ using namespace com::sun; //============================================================================ // -// INetURLObject +// INetURLObject // //============================================================================ @@ -488,16 +488,16 @@ enum static sal_uInt32 const aMustEncodeMap[128] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -/* */ PY, -/* ! */ PC+PD+PE +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, -/* " */ PU+PV +PY, -/* # */ PU, -/* $ */ PD+PE +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, -/* % */ PU, +/* */ PY, +/* ! */ PC+PD+PE +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, +/* " */ PU+PV +PY, +/* # */ PU, +/* $ */ PD+PE +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, +/* % */ PU, /* & */ PA+PB+PC+PD+PE +PH+PI+PJ+PK+PL+PM+PN+PO+PP +PR+PS+PT+PU+PV+PW+PX +PZ+P1+P2, -/* ' */ PD+PE +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, -/* ( */ PD+PE +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, -/* ) */ PD+PE +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, +/* ' */ PD+PE +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, +/* ( */ PD+PE +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, +/* ) */ PD+PE +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, /* * */ PA+PB+PC+PD+PE +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, /* + */ PA+PB+PC+PD+PE +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX +PZ+P1+P2, /* , */ PA+PB+PC+PD+PE +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW +PZ+P1+P2, @@ -514,13 +514,13 @@ static sal_uInt32 const aMustEncodeMap[128] /* 7 */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, /* 8 */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, /* 9 */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, -/* : */ PB+PC +PH+PI+PJ +PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX +PZ+P1+P2, -/* ; */ PC+PD +PI+PJ+PK+PL+PM +PO+PP+PQ+PR +PT+PU +PW +PZ+P1+P2, -/* < */ PC +PO+PP +PU+PV +PY, +/* : */ PB+PC +PH+PI+PJ +PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX +PZ+P1+P2, +/* ; */ PC+PD +PI+PJ+PK+PL+PM +PO+PP+PQ+PR +PT+PU +PW +PZ+P1+P2, +/* < */ PC +PO+PP +PU+PV +PY, /* = */ PA+PB+PC+PD+PE +PH+PI+PJ+PK+PL+PM+PN +PR+PS+PT+PU+PV+PW +PZ+P1+P2, -/* > */ PC +PO+PP +PU+PV +PY, -/* ? */ PC +PL +PT+PU +PW+PX +PZ +P2, -/* @ */ PC +PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1, +/* > */ PC +PO+PP +PU+PV +PY, +/* ? */ PC +PL +PT+PU +PW+PX +PZ +P2, +/* @ */ PC +PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1, /* A */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, /* B */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, /* C */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, @@ -547,12 +547,12 @@ static sal_uInt32 const aMustEncodeMap[128] /* X */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, /* Y */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, /* Z */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, -/* [ */ PL +PU+PV +PX, -/* \ */ PB +PU+PV +PY, -/* ] */ PL +PU+PV +PX, -/* ^ */ PU+PV +PY, +/* [ */ PL +PU+PV +PX, +/* \ */ PB +PU+PV +PY, +/* ] */ PL +PU+PV +PX, +/* ^ */ PU+PV +PY, /* _ */ PA+PB+PC+PD+PE +PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, -/* ` */ PU+PV +PY, +/* ` */ PU+PV +PY, /* a */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, /* b */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, /* c */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, @@ -579,9 +579,9 @@ static sal_uInt32 const aMustEncodeMap[128] /* x */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, /* y */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, /* z */ PA+PB+PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ+P1+P2, -/* { */ PU+PV +PY, -/* | */ PB+PC +PN +PT+PU+PV +PY, -/* } */ PU+PV +PY, +/* { */ PU+PV +PY, +/* | */ PB+PC +PN +PT+PU+PV +PY, +/* } */ PU+PV +PY, /* ~ */ PA+PB+PC+PD+PE +PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS+PT+PU+PV+PW+PX+PY+PZ +P2, 0 }; @@ -722,43 +722,43 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, // appropriate style bit is set in eStyle, if applicable) // determines the scheme. The productions use the auxiliary rules // - // domain = label *("." label) - // label = alphanum [*(alphanum / "-") alphanum] - // alphanum = ALPHA / DIGIT - // IPv6reference = "[" IPv6address "]" - // IPv6address = hexpart [":" IPv4address] - // IPv4address = 1*3DIGIT 3("." 1*3DIGIT) - // hexpart = (hexseq ["::" [hexseq]]) / ("::" [hexseq]) - // hexseq = hex4 *(":" hex4) - // hex4 = 1*4HEXDIG - // UCS4 = <any UCS4 character> + // domain = label *("." label) + // label = alphanum [*(alphanum / "-") alphanum] + // alphanum = ALPHA / DIGIT + // IPv6reference = "[" IPv6address "]" + // IPv6address = hexpart [":" IPv4address] + // IPv4address = 1*3DIGIT 3("." 1*3DIGIT) + // hexpart = (hexseq ["::" [hexseq]]) / ("::" [hexseq]) + // hexseq = hex4 *(":" hex4) + // hex4 = 1*4HEXDIG + // UCS4 = <any UCS4 character> // // 1st Production (known scheme): - // <one of the known schemes, ignoring case> ":" *UCS4 + // <one of the known schemes, ignoring case> ":" *UCS4 // // 2nd Production (mailto): - // domain "@" domain + // domain "@" domain // // 3rd Production (ftp): - // "FTP" 2*("." label) ["/" *UCS4] + // "FTP" 2*("." label) ["/" *UCS4] // // 4th Production (http): - // label 2*("." label) ["/" *UCS4] + // label 2*("." label) ["/" *UCS4] // // 5th Production (file): - // "//" (domain / IPv6reference) ["/" *UCS4] + // "//" (domain / IPv6reference) ["/" *UCS4] // // 6th Production (Unix file): // "/" *UCS4 // // 7th Production (UNC file; FSYS_DOS only): - // "\\" domain ["\" *UCS4] + // "\\" domain ["\" *UCS4] // // 8th Production (Unix-like DOS file; FSYS_DOS only): - // ALPHA ":" ["/" *UCS4] + // ALPHA ":" ["/" *UCS4] // // 9th Production (DOS file; FSYS_DOS only): - // ALPHA ":" ["\" *UCS4] + // ALPHA ":" ["\" *UCS4] // // For the 'non URL' file productions 6--9, the interpretation of // the input as a (degenerate) URI is turned off, i.e., escape @@ -992,23 +992,23 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, // determines the used notation. The productions use the // auxiliary rules // - // domain = label *("." label) - // label = alphanum [*(alphanum / "-") alphanum] - // alphanum = ALPHA / DIGIT - // IPv6reference = "[" IPv6address "]" - // IPv6address = hexpart [":" IPv4address] - // IPv4address = 1*3DIGIT 3("." 1*3DIGIT) - // hexpart = (hexseq ["::" [hexseq]]) / ("::" [hexseq]) - // hexseq = hex4 *(":" hex4) - // hex4 = 1*4HEXDIG - // path = <any UCS4 character except "#"> - // UCS4 = <any UCS4 character> + // domain = label *("." label) + // label = alphanum [*(alphanum / "-") alphanum] + // alphanum = ALPHA / DIGIT + // IPv6reference = "[" IPv6address "]" + // IPv6address = hexpart [":" IPv4address] + // IPv4address = 1*3DIGIT 3("." 1*3DIGIT) + // hexpart = (hexseq ["::" [hexseq]]) / ("::" [hexseq]) + // hexseq = hex4 *(":" hex4) + // hex4 = 1*4HEXDIG + // path = <any UCS4 character except "#"> + // UCS4 = <any UCS4 character> // 1st Production (URL): - // "//" [domain / IPv6reference] ["/" *path] - // ["#" *UCS4] - // becomes - // "file://" domain "/" *path ["#" *UCS4] + // "//" [domain / IPv6reference] ["/" *path] + // ["#" *UCS4] + // becomes + // "file://" domain "/" *path ["#" *UCS4] if (pEnd - pPos >= 2 && pPos[0] == '/' && pPos[1] == '/') { sal_Unicode const * p1 = pPos + 2; @@ -1032,20 +1032,20 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, // 2nd Production (MS IE generated 1; FSYS_DOS only): // "//" ALPHA ":" ["/" *path] ["#" *UCS4] - // becomes - // "file:///" ALPHA ":" ["/" *path] ["#" *UCS4] - // replacing "\" by "/" within <*path> + // becomes + // "file:///" ALPHA ":" ["/" *path] ["#" *UCS4] + // replacing "\" by "/" within <*path> // // 3rd Production (MS IE generated 2; FSYS_DOS only): // "//" ALPHA ":" ["\" *path] ["#" *UCS4] - // becomes - // "file:///" ALPHA ":" ["/" *path] ["#" *UCS4] - // replacing "\" by "/" within <*path> + // becomes + // "file:///" ALPHA ":" ["/" *path] ["#" *UCS4] + // replacing "\" by "/" within <*path> // // 4th Production (misscounted slashes): - // "//" *path ["#" *UCS4] - // becomes - // "file:///" *path ["#" *UCS4] + // "//" *path ["#" *UCS4] + // becomes + // "file:///" *path ["#" *UCS4] if (pEnd - pPos >= 2 && pPos[0] == '/' && pPos[1] == '/') { aSynAbsURIRef. @@ -1063,9 +1063,9 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, } // 5th Production (Unix): - // "/" *path ["#" *UCS4] - // becomes - // "file:///" *path ["#" *UCS4] + // "/" *path ["#" *UCS4] + // becomes + // "file:///" *path ["#" *UCS4] if (pPos < pEnd && *pPos == '/') { aSynAbsURIRef. @@ -1074,10 +1074,10 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, } // 6th Production (UNC; FSYS_DOS only): - // "\\" domain ["\" *path] ["#" *UCS4] - // becomes - // "file://" domain "/" *path ["#" *UCS4] - // replacing "\" by "/" within <*path> + // "\\" domain ["\" *path] ["#" *UCS4] + // becomes + // "file://" domain "/" *path ["#" *UCS4] + // replacing "\" by "/" within <*path> if (eStyle & FSYS_DOS && pEnd - pPos >= 2 && pPos[0] == '\\' @@ -1108,16 +1108,16 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, } // 7th Production (Unix-like DOS; FSYS_DOS only): - // ALPHA ":" ["/" *path] ["#" *UCS4] - // becomes - // "file:///" ALPHA ":" ["/" *path] ["#" *UCS4] - // replacing "\" by "/" within <*path> + // ALPHA ":" ["/" *path] ["#" *UCS4] + // becomes + // "file:///" ALPHA ":" ["/" *path] ["#" *UCS4] + // replacing "\" by "/" within <*path> // // 8th Production (DOS; FSYS_DOS only): - // ALPHA ":" ["\" *path] ["#" *UCS4] - // becomes - // "file:///" ALPHA ":" ["/" *path] ["#" *UCS4] - // replacing "\" by "/" within <*path> + // ALPHA ":" ["\" *path] ["#" *UCS4] + // becomes + // "file:///" ALPHA ":" ["/" *path] ["#" *UCS4] + // replacing "\" by "/" within <*path> if (eStyle & FSYS_DOS && pEnd - pPos >= 2 && INetMIME::isAlpha(pPos[0]) @@ -1134,20 +1134,20 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, } // 9th Production (any): - // *path ["#" *UCS4] - // becomes - // "file:///" *path ["#" *UCS4] - // replacing the delimiter by "/" within <*path>. The - // delimiter is that character from the set { "/", "\", - // ":" } which appears most often in <*path> (if FSYS_UNX + // *path ["#" *UCS4] + // becomes + // "file:///" *path ["#" *UCS4] + // replacing the delimiter by "/" within <*path>. The + // delimiter is that character from the set { "/", "\", + // ":" } which appears most often in <*path> (if FSYS_UNX // is not among the style bits, "/" is removed from the // set; if FSYS_DOS is not among the style bits, "\" is // removed from the set; if FSYS_MAC is not among the // style bits, ":" is removed from the set). If two or - // more characters appear the same number of times, the - // character mentioned first in that set is chosen. If - // the first character of <*path> is the delimiter, that - // character is not copied. + // more characters appear the same number of times, the + // character mentioned first in that set is chosen. If + // the first character of <*path> is the delimiter, that + // character is not copied. if (eStyle & (FSYS_UNX | FSYS_DOS | FSYS_MAC)) { aSynAbsURIRef. @@ -1223,7 +1223,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, pUserInfoBegin = pAuthority; pUserInfoEnd = pPos; } - else if (getSchemeInfo().m_bHost) + else if (getSchemeInfo().m_bHost) { pHostPortBegin = pAuthority; pHostPortEnd = pPos; @@ -1279,7 +1279,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, appendUCS4(aSynUser, nUTF32, eEscapeType, bOctets, ePart, cEscapePrefix, eCharset, false); } - m_aUser.set(aSynAbsURIRef, aSynUser.makeStringAndClear(), + m_aUser.set(aSynAbsURIRef, aSynUser.makeStringAndClear(), aSynAbsURIRef.getLength()); if (bHasAuth) { @@ -1297,7 +1297,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, appendUCS4(aSynAuth, nUTF32, eEscapeType, bOctets, ePart, cEscapePrefix, eCharset, false); } - m_aAuth.set(aSynAbsURIRef, aSynAuth.makeStringAndClear(), + m_aAuth.set(aSynAbsURIRef, aSynAuth.makeStringAndClear(), aSynAbsURIRef.getLength()); } else @@ -1320,7 +1320,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, appendUCS4(aSynAuth, nUTF32, eEscapeType, bOctets, ePart, cEscapePrefix, eCharset, false); } - m_aAuth.set(aSynAbsURIRef, aSynAuth.makeStringAndClear(), + m_aAuth.set(aSynAbsURIRef, aSynAuth.makeStringAndClear(), aSynAbsURIRef.getLength()); } } @@ -1375,12 +1375,12 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, setInvalid(); return false; } - m_aHost.set(aSynAbsURIRef, aSynHost.makeStringAndClear(), + m_aHost.set(aSynAbsURIRef, aSynHost.makeStringAndClear(), aSynAbsURIRef.getLength()); if (pPort != pHostPortEnd) { aSynAbsURIRef.append(sal_Unicode(':')); - m_aPort.set(aSynAbsURIRef, + m_aPort.set(aSynAbsURIRef, rtl::OUString(pPort + 1, pHostPortEnd - (pPort + 1)), aSynAbsURIRef.getLength()); } @@ -1398,7 +1398,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, setInvalid(); return false; } - m_aPath.set(aSynAbsURIRef, aSynPath.makeStringAndClear(), + m_aPath.set(aSynAbsURIRef, aSynPath.makeStringAndClear(), aSynAbsURIRef.getLength()); // Parse ?<query> @@ -1414,7 +1414,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, appendUCS4(aSynQuery, nUTF32, eEscapeType, bOctets, PART_URIC, cEscapePrefix, eCharset, true); } - m_aQuery.set(aSynAbsURIRef, aSynQuery.makeStringAndClear(), + m_aQuery.set(aSynAbsURIRef, aSynQuery.makeStringAndClear(), aSynAbsURIRef.getLength()); } @@ -1431,7 +1431,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, appendUCS4(aSynFragment, nUTF32, eEscapeType, bOctets, PART_URIC, cEscapePrefix, eCharset, true); } - m_aFragment.set(aSynAbsURIRef, aSynFragment.makeStringAndClear(), + m_aFragment.set(aSynAbsURIRef, aSynFragment.makeStringAndClear(), aSynAbsURIRef.getLength()); } @@ -1484,19 +1484,19 @@ bool INetURLObject::convertRelToAbs(rtl::OUString const & rTheRelURIRef, // interfere with the syntax of relative URI references.) The // productions use the auxiliary rules // - // domain = label *("." label) - // label = alphanum [*(alphanum / "-") alphanum] - // alphanum = ALPHA / DIGIT - // UCS4 = <any UCS4 character> + // domain = label *("." label) + // label = alphanum [*(alphanum / "-") alphanum] + // alphanum = ALPHA / DIGIT + // UCS4 = <any UCS4 character> // // 1st Production (UNC file; FSYS_DOS only): - // "\\" domain ["\" *UCS4] + // "\\" domain ["\" *UCS4] // // 2nd Production (Unix-like DOS file; FSYS_DOS only): - // ALPHA ":" ["/" *UCS4] + // ALPHA ":" ["/" *UCS4] // // 3rd Production (DOS file; FSYS_DOS only): - // ALPHA ":" ["\" *UCS4] + // ALPHA ":" ["\" *UCS4] if (eStyle & FSYS_DOS) { bool bFSys = false; @@ -1959,7 +1959,7 @@ bool INetURLObject::convertAbsToRel(rtl::OUString const & rTheAbsURIRef, // path could go into the new relative URL instead, but some people don't // like that): rtl::OUStringBuffer aSynRelURIRef; -// if (nMatch <= 1) nMatch = 0; else // see comment above +// if (nMatch <= 1) nMatch = 0; else // see comment above for (sal_Unicode const * p = pBasePathBegin + nMatch; p != pBasePathEnd; ++p) { @@ -2012,7 +2012,7 @@ bool INetURLObject::convertAbsToRel(rtl::OUString const & rTheAbsURIRef, if (aSubject.m_aFragment.isPresent()) { aSynRelURIRef.append(sal_Unicode('#')); - aSynRelURIRef.append(aSubject.decode(aSubject.m_aFragment, + aSynRelURIRef.append(aSubject.decode(aSubject.m_aFragment, cEscapePrefix, eDecodeMechanism, eCharset)); } @@ -2039,7 +2039,7 @@ bool INetURLObject::convertIntToExt(rtl::OUString const & rTheIntURIRef, bool bConvert = pPrefix && pPrefix->m_eKind == PrefixInfo::INTERNAL; if (bConvert) { - aSynExtURIRef = + aSynExtURIRef = aSynExtURIRef.replaceAt(0, p - pBegin, rtl::OUString::createFromAscii(pPrefix->m_pTranslatedPrefix)); } @@ -2067,7 +2067,7 @@ bool INetURLObject::convertExtToInt(rtl::OUString const & rTheExtURIRef, bool bConvert = pPrefix && pPrefix->m_eKind == PrefixInfo::EXTERNAL; if (bConvert) { - aSynIntURIRef = + aSynIntURIRef = aSynIntURIRef.replaceAt(0, p - pBegin, rtl::OUString::createFromAscii(pPrefix->m_pTranslatedPrefix)); } @@ -2247,7 +2247,7 @@ bool INetURLObject::setUser(rtl::OUString const & rTheUser, rtl_TextEncoding eCharset) { if ( - !getSchemeInfo().m_bUser || + !getSchemeInfo().m_bUser || (m_eScheme == INET_PROT_IMAP && rTheUser.getLength() == 0) ) { @@ -2299,7 +2299,7 @@ bool INetURLObject::clearPassword() return false; if (m_aAuth.isPresent()) { - lcl_Erase(m_aAbsURIRef, m_aAuth.getBegin() - 1, + lcl_Erase(m_aAbsURIRef, m_aAuth.getBegin() - 1, m_aAuth.getLength() + 1); sal_Int32 nDelta = m_aAuth.clear() - 1; m_aHost += nDelta; @@ -2312,7 +2312,7 @@ bool INetURLObject::clearPassword() } //============================================================================ -bool INetURLObject::setPassword(rtl::OUString const & rThePassword, +bool INetURLObject::setPassword(rtl::OUString const & rThePassword, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { @@ -3439,7 +3439,7 @@ bool INetURLObject::checkHierarchical() const { } //============================================================================ -bool INetURLObject::appendSegment(rtl::OUString const & rTheSegment, +bool INetURLObject::appendSegment(rtl::OUString const & rTheSegment, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { @@ -3578,7 +3578,7 @@ bool INetURLObject::insertName(rtl::OUString const & rTheName, bool bOctets, } aNewPath.append(pSuffixBegin, pPathEnd - pSuffixBegin); - return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, + return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, RTL_TEXTENCODING_UTF8); } @@ -3589,7 +3589,7 @@ bool INetURLObject::clearQuery() return false; if (m_aQuery.isPresent()) { - lcl_Erase(m_aAbsURIRef, m_aQuery.getBegin() - 1, + lcl_Erase(m_aAbsURIRef, m_aQuery.getBegin() - 1, m_aQuery.getLength() + 1); m_aFragment += m_aQuery.clear() - 1; } @@ -3633,7 +3633,7 @@ bool INetURLObject::clearFragment() } //============================================================================ -bool INetURLObject::setFragment(rtl::OUString const & rTheFragment, +bool INetURLObject::setFragment(rtl::OUString const & rTheFragment, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { @@ -3775,7 +3775,7 @@ rtl::OUString INetURLObject::decode(sal_Unicode const * pBegin, case ESCAPE_UTF32: if ( - INetMIME::isUSASCII(nUTF32) && + INetMIME::isUSASCII(nUTF32) && ( eMechanism == DECODE_TO_IURI || ( @@ -4215,7 +4215,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme, setInvalid(); return false; } - m_aHost.set(m_aAbsURIRef, aSynHost.makeStringAndClear(), + m_aHost.set(m_aAbsURIRef, aSynHost.makeStringAndClear(), m_aAbsURIRef.getLength()); if (nThePort != 0) { @@ -4249,7 +4249,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme, setInvalid(); return false; } - m_aPath.set(m_aAbsURIRef, aSynPath.makeStringAndClear(), + m_aPath.set(m_aAbsURIRef, aSynPath.makeStringAndClear(), m_aAbsURIRef.getLength()); return true; } @@ -4339,12 +4339,12 @@ rtl::OUString INetURLObject::GetHostPort(DecodeMechanism eMechanism, // PROT_VND_SUN_STAR_PKG misuse m_aHost: if (!getSchemeInfo().m_bHost) return rtl::OUString(); - rtl::OUStringBuffer aHostPort(decode(m_aHost, getEscapePrefix(), + rtl::OUStringBuffer aHostPort(decode(m_aHost, getEscapePrefix(), eMechanism, eCharset)); if (m_aPort.isPresent()) { aHostPort.append(sal_Unicode(':')); - aHostPort.append(decode(m_aPort, getEscapePrefix(), + aHostPort.append(decode(m_aPort, getEscapePrefix(), eMechanism, eCharset)); } return aHostPort.makeStringAndClear(); @@ -4452,7 +4452,7 @@ bool INetURLObject::removeSegment(sal_Int32 nIndex, bool bIgnoreFinalSlash) aNewPath.append(sal_Unicode('/')); } - return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, + return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, RTL_TEXTENCODING_UTF8); } @@ -4507,7 +4507,7 @@ bool INetURLObject::setName(rtl::OUString const & rTheName, sal_Int32 nIndex, eMechanism, eCharset, true)); aNewPath.append(p, pPathEnd - p); - return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, + return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, RTL_TEXTENCODING_UTF8); } @@ -4591,7 +4591,7 @@ bool INetURLObject::setBase(rtl::OUString const & rTheBase, sal_Int32 nIndex, eMechanism, eCharset, true)); aNewPath.append(pExtension, pPathEnd - pExtension); - return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, + return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, RTL_TEXTENCODING_UTF8); } @@ -4657,7 +4657,7 @@ bool INetURLObject::setExtension(rtl::OUString const & rTheExtension, getEscapePrefix(), eMechanism, eCharset, true)); aNewPath.append(p, pPathEnd - p); - return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, + return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, RTL_TEXTENCODING_UTF8); } @@ -4689,7 +4689,7 @@ bool INetURLObject::removeExtension(sal_Int32 nIndex, bool bIgnoreFinalSlash) aNewPath.append(pPathBegin, pExtension - pPathBegin); aNewPath.append(p, pPathEnd - p); - return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, + return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, RTL_TEXTENCODING_UTF8); } @@ -4721,7 +4721,7 @@ bool INetURLObject::setFinalSlash() aNewPath.append(pPathBegin, pPathEnd - pPathBegin); aNewPath.append(sal_Unicode('/')); - return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, + return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC, RTL_TEXTENCODING_UTF8); } @@ -4762,7 +4762,7 @@ rtl::OUString INetURLObject::createFragment(rtl::OUString const & rText) } //============================================================================ -bool INetURLObject::setFSysPath(rtl::OUString const & rFSysPath, +bool INetURLObject::setFSysPath(rtl::OUString const & rFSysPath, FSysStyle eStyle) { sal_Unicode const * pFSysBegin = rFSysPath.getStr(); @@ -4948,7 +4948,7 @@ bool INetURLObject::setFSysPath(rtl::OUString const & rFSysPath, break; } - INetURLObject aTemp(aSynAbsURIRef.makeStringAndClear(), WAS_ENCODED, + INetURLObject aTemp(aSynAbsURIRef.makeStringAndClear(), WAS_ENCODED, RTL_TEXTENCODING_UTF8); if (aTemp.HasError()) return false; @@ -5561,7 +5561,7 @@ rtl::OUString INetURLObject::CutExtension(DecodeMechanism eMechanism, { rtl::OUString aTheExtension(getExtension(LAST_SEGMENT, false, eMechanism, eCharset)); - return removeExtension(LAST_SEGMENT, false) + return removeExtension(LAST_SEGMENT, false) ? aTheExtension : rtl::OUString(); } diff --git a/tools/source/fsys/wldcrd.cxx b/tools/source/fsys/wldcrd.cxx index ea8190b5c388..293d16877498 100644 --- a/tools/source/fsys/wldcrd.cxx +++ b/tools/source/fsys/wldcrd.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -121,7 +121,7 @@ BOOL WildCard::Matches( const String& rString ) const { ByteString aTmpWild = aWildString; ByteString aString(rString, osl_getThreadTextEncoding()); - + USHORT nSepPos; if ( cSepSymbol != '\0' ) diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx index 0c08568791e1..a8cf1c1eecec 100644 --- a/tools/source/fsys/wntmsc.cxx +++ b/tools/source/fsys/wntmsc.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -527,21 +527,21 @@ void FileStat::ImpInit( void* p ) FILETIME aLocTime; // use the last write date / time when the creation date / time isn't set - if ( ( pDirEnt->ftCreationTime.dwLowDateTime == 0 ) && + if ( ( pDirEnt->ftCreationTime.dwLowDateTime == 0 ) && ( pDirEnt->ftCreationTime.dwHighDateTime == 0 ) ) { pDirEnt->ftCreationTime.dwLowDateTime = pDirEnt->ftLastWriteTime.dwLowDateTime; pDirEnt->ftCreationTime.dwHighDateTime = pDirEnt->ftLastWriteTime.dwHighDateTime; } - + // use the last write date / time when the last accessed date / time isn't set - if ( ( pDirEnt->ftLastAccessTime.dwLowDateTime == 0 ) && + if ( ( pDirEnt->ftLastAccessTime.dwLowDateTime == 0 ) && ( pDirEnt->ftLastAccessTime.dwHighDateTime == 0 ) ) { pDirEnt->ftLastAccessTime.dwLowDateTime = pDirEnt->ftLastWriteTime.dwLowDateTime; pDirEnt->ftLastAccessTime.dwHighDateTime = pDirEnt->ftLastWriteTime.dwHighDateTime; } - + FileTimeToLocalFileTime( &pDirEnt->ftCreationTime, &aLocTime ); FileTimeToSystemTime( &aLocTime, &aSysTime ); aDateCreated = Date( aSysTime.wDay, aSysTime.wMonth, aSysTime.wYear ); diff --git a/tools/source/fsys/wntmsc.hxx b/tools/source/fsys/wntmsc.hxx index 7fac28b56b09..a6202cc71cc6 100644 --- a/tools/source/fsys/wntmsc.hxx +++ b/tools/source/fsys/wntmsc.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,7 +84,7 @@ typedef struct #define PATHDELIMITER ";" #define DEFSTYLE FSYS_STYLE_NTFS #define MKDIR( p ) mkdir( p ) -#define CMP_LOWER(s) ( ByteString(s).ToLowerAscii() ) +#define CMP_LOWER(s) ( ByteString(s).ToLowerAscii() ) #define START_DRV 'a' diff --git a/tools/source/generic/b3dtrans.cxx b/tools/source/generic/b3dtrans.cxx index f3c29555f7bb..9ed887457035 100644 --- a/tools/source/generic/b3dtrans.cxx +++ b/tools/source/generic/b3dtrans.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -324,7 +324,7 @@ void B3dTransformationSet::CalcViewport() { // X vergroessern fFactor = 1.0 / fActRatio; - fRight *= fFactor; + fRight *= fFactor; fLeft *= fFactor; } else @@ -350,7 +350,7 @@ void B3dTransformationSet::CalcViewport() { // X verkleinern fFactor = 1.0 / fActRatio; - fRight *= fFactor; + fRight *= fFactor; fLeft *= fFactor; } break; @@ -798,7 +798,7 @@ const basegfx::B2DPoint B3dTransformationSet::TransTextureCoor(const basegfx::B2 \************************************************************************/ B3dViewport::B3dViewport() -: B3dTransformationSet(), +: B3dTransformationSet(), aVRP(0, 0, 0), aVPN(0, 0, 1), aVUV(0, 1, 0) @@ -853,7 +853,7 @@ void B3dViewport::CalcOrientation() B3dCamera::B3dCamera( const basegfx::B3DPoint& rPos, const basegfx::B3DVector& rLkAt, double fFocLen, double fBnkAng, sal_Bool bUseFocLen) -: B3dViewport(), +: B3dViewport(), aPosition(rPos), aCorrectedPosition(rPos), aLookAt(rLkAt), diff --git a/tools/source/generic/bigint.cxx b/tools/source/generic/bigint.cxx index 51dc70d242d6..7b10f31d733f 100644 --- a/tools/source/generic/bigint.cxx +++ b/tools/source/generic/bigint.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx index 07d7e87aaa82..37e9dedf9259 100644 --- a/tools/source/generic/color.cxx +++ b/tools/source/generic/color.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,9 +63,9 @@ Color::Color( const ResId& rResId ) pResMgr->Increment( sizeof( RSHEADER_TYPE ) ); // Daten laden - USHORT nRed = pResMgr->ReadShort(); - USHORT nGreen = pResMgr->ReadShort(); - USHORT nBlue = pResMgr->ReadShort(); + USHORT nRed = pResMgr->ReadShort(); + USHORT nGreen = pResMgr->ReadShort(); + USHORT nBlue = pResMgr->ReadShort(); // one more historical ULONG pResMgr->ReadLong(); @@ -79,8 +79,8 @@ Color::Color( const ResId& rResId ) } UINT8 Color::GetColorError( const Color& rCompareColor ) const { - const long nErrAbs = labs( (long) rCompareColor.GetRed() - GetRed() ) + - labs( (long) rCompareColor.GetGreen() - GetGreen() ) + + const long nErrAbs = labs( (long) rCompareColor.GetRed() - GetRed() ) + + labs( (long) rCompareColor.GetGreen() - GetGreen() ) + labs( (long) rCompareColor.GetBlue() - GetBlue() ); return (UINT8) _FRound( nErrAbs * 0.3333333333 ); @@ -147,14 +147,14 @@ void Color::Invert() BOOL Color::IsDark() const { - return GetLuminance() <= 38; + return GetLuminance() <= 38; } // ----------------------------------------------------------------------- BOOL Color::IsBright() const { - return GetLuminance() >= 245; + return GetLuminance() >= 245; } // ----------------------------------------------------------------------- @@ -249,12 +249,12 @@ ColorData Color::HSBtoRGB( USHORT nHue, USHORT nSat, USHORT nBri ) switch( n ) { - case 0: cR = nB; cG = c; cB = a; break; - case 1: cR = b; cG = nB; cB = a; break; - case 2: cR = a; cG = nB; cB = c; break; - case 3: cR = a; cG = b; cB = nB; break; - case 4: cR = c; cG = a; cB = nB; break; - case 5: cR = nB; cG = a; cB = b; break; + case 0: cR = nB; cG = c; cB = a; break; + case 1: cR = b; cG = nB; cB = a; break; + case 2: cR = a; cG = nB; cB = c; break; + case 3: cR = a; cG = b; cB = nB; break; + case 4: cR = c; cG = a; cB = nB; break; + case 5: cR = nB; cG = a; cB = b; break; } } @@ -287,13 +287,13 @@ SvStream& Color::Write( SvStream& rOStm, BOOL bNewFormat ) // ----------------------------------------------------------------------- -#define COL_NAME_USER ((USHORT)0x8000) -#define COL_RED_1B ((USHORT)0x0001) -#define COL_RED_2B ((USHORT)0x0002) -#define COL_GREEN_1B ((USHORT)0x0010) -#define COL_GREEN_2B ((USHORT)0x0020) -#define COL_BLUE_1B ((USHORT)0x0100) -#define COL_BLUE_2B ((USHORT)0x0200) +#define COL_NAME_USER ((USHORT)0x8000) +#define COL_RED_1B ((USHORT)0x0001) +#define COL_RED_2B ((USHORT)0x0002) +#define COL_GREEN_1B ((USHORT)0x0010) +#define COL_GREEN_2B ((USHORT)0x0020) +#define COL_BLUE_1B ((USHORT)0x0100) +#define COL_BLUE_2B ((USHORT)0x0200) // ----------------------------------------------------------------------- @@ -301,10 +301,10 @@ SvStream& operator>>( SvStream& rIStream, Color& rColor ) { DBG_ASSERTWARNING( rIStream.GetVersion(), "Color::>> - Solar-Version not set on rIStream" ); - USHORT nColorName; - USHORT nRed; - USHORT nGreen; - USHORT nBlue; + USHORT nColorName; + USHORT nRed; + USHORT nGreen; + USHORT nBlue; rIStream >> nColorName; @@ -312,12 +312,12 @@ SvStream& operator>>( SvStream& rIStream, Color& rColor ) { if ( rIStream.GetCompressMode() == COMPRESSMODE_FULL ) { - unsigned char cAry[6]; - USHORT i = 0; + unsigned char cAry[6]; + USHORT i = 0; - nRed = 0; - nGreen = 0; - nBlue = 0; + nRed = 0; + nGreen = 0; + nBlue = 0; if ( nColorName & COL_RED_2B ) i += 2; @@ -391,37 +391,37 @@ SvStream& operator>>( SvStream& rIStream, Color& rColor ) { static ColorData aColAry[] = { - COL_BLACK, // COL_BLACK - COL_BLUE, // COL_BLUE - COL_GREEN, // COL_GREEN - COL_CYAN, // COL_CYAN - COL_RED, // COL_RED - COL_MAGENTA, // COL_MAGENTA - COL_BROWN, // COL_BROWN - COL_GRAY, // COL_GRAY - COL_LIGHTGRAY, // COL_LIGHTGRAY - COL_LIGHTBLUE, // COL_LIGHTBLUE - COL_LIGHTGREEN, // COL_LIGHTGREEN - COL_LIGHTCYAN, // COL_LIGHTCYAN - COL_LIGHTRED, // COL_LIGHTRED - COL_LIGHTMAGENTA, // COL_LIGHTMAGENTA - COL_YELLOW, // COL_YELLOW - COL_WHITE, // COL_WHITE - COL_WHITE, // COL_MENUBAR - COL_BLACK, // COL_MENUBARTEXT - COL_WHITE, // COL_POPUPMENU - COL_BLACK, // COL_POPUPMENUTEXT - COL_BLACK, // COL_WINDOWTEXT - COL_WHITE, // COL_WINDOWWORKSPACE - COL_BLACK, // COL_HIGHLIGHT - COL_WHITE, // COL_HIGHLIGHTTEXT - COL_BLACK, // COL_3DTEXT - COL_LIGHTGRAY, // COL_3DFACE - COL_WHITE, // COL_3DLIGHT - COL_GRAY, // COL_3DSHADOW - COL_LIGHTGRAY, // COL_SCROLLBAR - COL_WHITE, // COL_FIELD - COL_BLACK // COL_FIELDTEXT + COL_BLACK, // COL_BLACK + COL_BLUE, // COL_BLUE + COL_GREEN, // COL_GREEN + COL_CYAN, // COL_CYAN + COL_RED, // COL_RED + COL_MAGENTA, // COL_MAGENTA + COL_BROWN, // COL_BROWN + COL_GRAY, // COL_GRAY + COL_LIGHTGRAY, // COL_LIGHTGRAY + COL_LIGHTBLUE, // COL_LIGHTBLUE + COL_LIGHTGREEN, // COL_LIGHTGREEN + COL_LIGHTCYAN, // COL_LIGHTCYAN + COL_LIGHTRED, // COL_LIGHTRED + COL_LIGHTMAGENTA, // COL_LIGHTMAGENTA + COL_YELLOW, // COL_YELLOW + COL_WHITE, // COL_WHITE + COL_WHITE, // COL_MENUBAR + COL_BLACK, // COL_MENUBARTEXT + COL_WHITE, // COL_POPUPMENU + COL_BLACK, // COL_POPUPMENUTEXT + COL_BLACK, // COL_WINDOWTEXT + COL_WHITE, // COL_WINDOWWORKSPACE + COL_BLACK, // COL_HIGHLIGHT + COL_WHITE, // COL_HIGHLIGHTTEXT + COL_BLACK, // COL_3DTEXT + COL_LIGHTGRAY, // COL_3DFACE + COL_WHITE, // COL_3DLIGHT + COL_GRAY, // COL_3DSHADOW + COL_LIGHTGRAY, // COL_SCROLLBAR + COL_WHITE, // COL_FIELD + COL_BLACK // COL_FIELDTEXT }; if ( nColorName < (sizeof( aColAry )/sizeof(ColorData)) ) @@ -439,18 +439,18 @@ SvStream& operator<<( SvStream& rOStream, const Color& rColor ) { DBG_ASSERTWARNING( rOStream.GetVersion(), "Color::<< - Solar-Version not set on rOStream" ); - USHORT nColorName = COL_NAME_USER; - USHORT nRed = rColor.GetRed(); - USHORT nGreen = rColor.GetGreen(); - USHORT nBlue = rColor.GetBlue(); - nRed = (nRed<<8) + nRed; - nGreen = (nGreen<<8) + nGreen; - nBlue = (nBlue<<8) + nBlue; + USHORT nColorName = COL_NAME_USER; + USHORT nRed = rColor.GetRed(); + USHORT nGreen = rColor.GetGreen(); + USHORT nBlue = rColor.GetBlue(); + nRed = (nRed<<8) + nRed; + nGreen = (nGreen<<8) + nGreen; + nBlue = (nBlue<<8) + nBlue; if ( rOStream.GetCompressMode() == COMPRESSMODE_FULL ) { - unsigned char cAry[6]; - USHORT i = 0; + unsigned char cAry[6]; + USHORT i = 0; if ( nRed & 0x00FF ) { diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx index c4ad3ae76ecd..1a94c2b11198 100644 --- a/tools/source/generic/config.cxx +++ b/tools/source/generic/config.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ #include <tools/config.hxx> #include <osl/security.h> -#define MAXBUFLEN 1024 // Fuer Buffer bei VOS-Funktionen +#define MAXBUFLEN 1024 // Fuer Buffer bei VOS-Funktionen // ----------------- // - ImplConfigData - @@ -53,31 +53,31 @@ struct ImplKeyData { - ImplKeyData* mpNext; - ByteString maKey; - ByteString maValue; - BOOL mbIsComment; + ImplKeyData* mpNext; + ByteString maKey; + ByteString maValue; + BOOL mbIsComment; }; struct ImplGroupData { - ImplGroupData* mpNext; - ImplKeyData* mpFirstKey; - ByteString maGroupName; - USHORT mnEmptyLines; + ImplGroupData* mpNext; + ImplKeyData* mpFirstKey; + ByteString maGroupName; + USHORT mnEmptyLines; }; struct ImplConfigData { - ImplGroupData* mpFirstGroup; - XubString maFileName; - ULONG mnDataUpdateId; - ULONG mnTimeStamp; - LineEnd meLineEnd; - USHORT mnRefCount; - BOOL mbModified; - BOOL mbRead; - BOOL mbIsUTF8BOM; + ImplGroupData* mpFirstGroup; + XubString maFileName; + ULONG mnDataUpdateId; + ULONG mnTimeStamp; + LineEnd meLineEnd; + USHORT mnRefCount; + BOOL mbModified; + BOOL mbRead; + BOOL mbIsUTF8BOM; }; // ======================================================================= @@ -93,7 +93,7 @@ static ByteString& getEmptyByteString() static String toUncPath( const String& rPath ) { ::rtl::OUString aFileURL; - + // check if rFileName is already a URL; if not make it so if( rPath.CompareToAscii( "file://", 7 ) == COMPARE_EQUAL ) aFileURL = rPath; @@ -115,7 +115,7 @@ static ULONG ImplSysGetConfigTimeStamp( const XubString& rFileName ) { nTimeStamp = aStatus.getModifyTime().Seconds; } - + return nTimeStamp; } @@ -124,7 +124,7 @@ static ULONG ImplSysGetConfigTimeStamp( const XubString& rFileName ) static BYTE* ImplSysReadConfig( const XubString& rFileName, sal_uInt64& rRead, BOOL& rbRead, BOOL& rbIsUTF8BOM, ULONG& rTimeStamp ) { - BYTE* pBuf = NULL; + BYTE* pBuf = NULL; ::osl::File aFile( rFileName ); if( aFile.open( osl_File_OpenFlag_Read ) == ::osl::FileBase::E_None ) @@ -250,7 +250,7 @@ static String ImplMakeConfigName( const XubString* pFileName, ::rtl::OUString aName( aPathName ); aName += ::rtl::OUString::createFromAscii( "/" ); aName += aFileName; - + return aName; } @@ -286,11 +286,11 @@ static void ImplMakeConfigList( ImplConfigData* pData, xub_StrLen nNameLen; xub_StrLen nKeyLen; sal_uInt64 i; - const BYTE* pLine; - ImplKeyData* pPrevKey = NULL; - ImplKeyData* pKey; - ImplGroupData* pPrevGroup = NULL; - ImplGroupData* pGroup = NULL; + const BYTE* pLine; + ImplKeyData* pPrevKey = NULL; + ImplKeyData* pKey; + ImplGroupData* pPrevGroup = NULL; + ImplGroupData* pGroup = NULL; i = 0; while ( i < nLen ) { @@ -323,17 +323,17 @@ static void ImplMakeConfigList( ImplConfigData* pData, // Zeile auswerten if ( *pLine == '[' ) { - pGroup = new ImplGroupData; - pGroup->mpNext = NULL; - pGroup->mpFirstKey = NULL; + pGroup = new ImplGroupData; + pGroup->mpNext = NULL; + pGroup->mpFirstKey = NULL; pGroup->mnEmptyLines = 0; if ( pPrevGroup ) pPrevGroup->mpNext = pGroup; else pData->mpFirstGroup = pGroup; - pPrevGroup = pGroup; - pPrevKey = NULL; - pKey = NULL; + pPrevGroup = pGroup; + pPrevKey = NULL; + pKey = NULL; // Gruppennamen rausfiltern pLine++; @@ -362,16 +362,16 @@ static void ImplMakeConfigList( ImplConfigData* pData, // Default-Gruppe if ( !pGroup ) { - pGroup = new ImplGroupData; - pGroup->mpNext = NULL; - pGroup->mpFirstKey = NULL; + pGroup = new ImplGroupData; + pGroup->mpNext = NULL; + pGroup->mpFirstKey = NULL; pGroup->mnEmptyLines = 0; if ( pPrevGroup ) pPrevGroup->mpNext = pGroup; else pData->mpFirstGroup = pGroup; - pPrevGroup = pGroup; - pPrevKey = NULL; + pPrevGroup = pGroup; + pPrevKey = NULL; } // Falls Leerzeile vorhanden, dann anhaengen @@ -379,16 +379,16 @@ static void ImplMakeConfigList( ImplConfigData* pData, { while ( pGroup->mnEmptyLines ) { - pKey = new ImplKeyData; - pKey->mbIsComment = TRUE; - pPrevKey->mpNext = pKey; - pPrevKey = pKey; + pKey = new ImplKeyData; + pKey->mbIsComment = TRUE; + pPrevKey->mpNext = pKey; + pPrevKey = pKey; pGroup->mnEmptyLines--; } } // Neuen Key erzeugen - pKey = new ImplKeyData; + pKey = new ImplKeyData; pKey->mpNext = NULL; if ( pPrevKey ) pPrevKey->mpNext = pKey; @@ -451,15 +451,15 @@ static void ImplMakeConfigList( ImplConfigData* pData, static BYTE* ImplGetConfigBuffer( const ImplConfigData* pData, ULONG& rLen ) { - BYTE* pWriteBuf; - BYTE* pBuf; - BYTE aLineEndBuf[2] = {0, 0}; - ImplKeyData* pKey; - ImplGroupData* pGroup; - unsigned int nBufLen; - USHORT nValueLen; - USHORT nKeyLen; - USHORT nLineEndLen; + BYTE* pWriteBuf; + BYTE* pBuf; + BYTE aLineEndBuf[2] = {0, 0}; + ImplKeyData* pKey; + ImplGroupData* pGroup; + unsigned int nBufLen; + USHORT nValueLen; + USHORT nKeyLen; + USHORT nLineEndLen; if ( pData->meLineEnd == LINEEND_CR ) { @@ -604,11 +604,11 @@ static BYTE* ImplGetConfigBuffer( const ImplConfigData* pData, ULONG& rLen ) static void ImplReadConfig( ImplConfigData* pData ) { - ULONG nTimeStamp = 0; + ULONG nTimeStamp = 0; sal_uInt64 nRead = 0; - BOOL bRead = FALSE; - BOOL bIsUTF8BOM =FALSE; - BYTE* pBuf = ImplSysReadConfig( pData->maFileName, nRead, bRead, bIsUTF8BOM, nTimeStamp ); + BOOL bRead = FALSE; + BOOL bIsUTF8BOM =FALSE; + BYTE* pBuf = ImplSysReadConfig( pData->maFileName, nRead, bRead, bIsUTF8BOM, nTimeStamp ); // Aus dem Buffer die Config-Verwaltungsliste aufbauen if ( pBuf ) @@ -639,8 +639,8 @@ static void ImplWriteConfig( ImplConfigData* pData ) #endif // Aus der Config-Liste einen Buffer zusammenbauen - ULONG nBufLen; - BYTE* pBuf = ImplGetConfigBuffer( pData, nBufLen ); + ULONG nBufLen; + BYTE* pBuf = ImplGetConfigBuffer( pData, nBufLen ); if ( pBuf ) { if ( ImplSysWriteConfig( pData->maFileName, pBuf, nBufLen, pData->mbIsUTF8BOM, pData->mnTimeStamp ) ) @@ -655,10 +655,10 @@ static void ImplWriteConfig( ImplConfigData* pData ) static void ImplDeleteConfigData( ImplConfigData* pData ) { - ImplKeyData* pTempKey; - ImplKeyData* pKey; - ImplGroupData* pTempGroup; - ImplGroupData* pGroup = pData->mpFirstGroup; + ImplKeyData* pTempKey; + ImplKeyData* pKey; + ImplGroupData* pTempGroup; + ImplGroupData* pGroup = pData->mpFirstGroup; while ( pGroup ) { pTempGroup = pGroup->mpNext; @@ -686,13 +686,13 @@ static ImplConfigData* ImplGetConfigData( const XubString& rFileName ) { ImplConfigData* pData; - pData = new ImplConfigData; - pData->maFileName = rFileName; - pData->mpFirstGroup = NULL; - pData->mnDataUpdateId = 0; - pData->meLineEnd = LINEEND_CRLF; - pData->mnRefCount = 0; - pData->mbRead = FALSE; + pData = new ImplConfigData; + pData->maFileName = rFileName; + pData->mpFirstGroup = NULL; + pData->mnDataUpdateId = 0; + pData->meLineEnd = LINEEND_CRLF; + pData->mnRefCount = 0; + pData->mbRead = FALSE; pData->mbIsUTF8BOM = FALSE; ImplReadConfig( pData ); @@ -743,9 +743,9 @@ ImplGroupData* Config::ImplGetGroup() const // Falls Gruppe noch nicht existiert, dann dazufuegen if ( !pGroup ) { - pGroup = new ImplGroupData; - pGroup->mpNext = NULL; - pGroup->mpFirstKey = NULL; + pGroup = new ImplGroupData; + pGroup->mpNext = NULL; + pGroup->mpFirstKey = NULL; pGroup->mnEmptyLines = 1; if ( pPrevGroup ) pPrevGroup->mpNext = pGroup; @@ -756,9 +756,9 @@ ImplGroupData* Config::ImplGetGroup() const // Gruppenname immer uebernehmen, da er auch in dieser Form // geschrieben werden soll. Ausserdem die Cache-Members der // Config-Klasse updaten - pGroup->maGroupName = maGroupName; + pGroup->maGroupName = maGroupName; ((Config*)this)->mnDataUpdateId = mpData->mnDataUpdateId; - ((Config*)this)->mpActGroup = pGroup; + ((Config*)this)->mpActGroup = pGroup; } return mpActGroup; @@ -769,12 +769,12 @@ ImplGroupData* Config::ImplGetGroup() const Config::Config() { // Daten initialisieren und einlesen - maFileName = ImplMakeConfigName( NULL, NULL ); - mpData = ImplGetConfigData( maFileName ); - mpActGroup = NULL; - mnDataUpdateId = 0; - mnLockCount = 1; - mbPersistence = TRUE; + maFileName = ImplMakeConfigName( NULL, NULL ); + mpData = ImplGetConfigData( maFileName ); + mpActGroup = NULL; + mnDataUpdateId = 0; + mnLockCount = 1; + mbPersistence = TRUE; #ifdef DBG_UTIL DBG_TRACE( "Config::Config()" ); @@ -786,12 +786,12 @@ Config::Config() Config::Config( const XubString& rFileName ) { // Daten initialisieren und einlesen - maFileName = toUncPath( rFileName ); - mpData = ImplGetConfigData( maFileName ); - mpActGroup = NULL; - mnDataUpdateId = 0; - mnLockCount = 1; - mbPersistence = TRUE; + maFileName = toUncPath( rFileName ); + mpData = ImplGetConfigData( maFileName ); + mpActGroup = NULL; + mnDataUpdateId = 0; + mnLockCount = 1; + mbPersistence = TRUE; #ifdef DBG_UTIL ByteString aTraceStr( "Config::Config( " ); @@ -841,8 +841,8 @@ void Config::SetGroup( const ByteString& rGroup ) // Gruppe neu ermittelt werden if ( maGroupName != rGroup ) { - maGroupName = rGroup; - mnDataUpdateId = mpData->mnDataUpdateId-1; + maGroupName = rGroup; + mnDataUpdateId = mpData->mnDataUpdateId-1; } } @@ -909,9 +909,9 @@ ByteString Config::GetGroupName( USHORT nGroup ) const if ( !mnLockCount ) ImplUpdateConfig(); - ImplGroupData* pGroup = mpData->mpFirstGroup; - USHORT nGroupCount = 0; - ByteString aGroupName; + ImplGroupData* pGroup = mpData->mpFirstGroup; + USHORT nGroupCount = 0; + ByteString aGroupName; while ( pGroup ) { if ( nGroup == nGroupCount ) @@ -935,8 +935,8 @@ USHORT Config::GetGroupCount() const if ( !mnLockCount ) ImplUpdateConfig(); - ImplGroupData* pGroup = mpData->mpFirstGroup; - USHORT nGroupCount = 0; + ImplGroupData* pGroup = mpData->mpFirstGroup; + USHORT nGroupCount = 0; while ( pGroup ) { nGroupCount++; @@ -954,8 +954,8 @@ BOOL Config::HasGroup( const ByteString& rGroup ) const if ( !mnLockCount ) ImplUpdateConfig(); - ImplGroupData* pGroup = mpData->mpFirstGroup; - BOOL bRet = FALSE; + ImplGroupData* pGroup = mpData->mpFirstGroup; + BOOL bRet = FALSE; while( pGroup ) { @@ -1064,9 +1064,9 @@ void Config::WriteKey( const ByteString& rKey, const ByteString& rStr ) BOOL bNewValue; if ( !pKey ) { - pKey = new ImplKeyData; - pKey->mpNext = NULL; - pKey->maKey = rKey; + pKey = new ImplKeyData; + pKey->mpNext = NULL; + pKey->maKey = rKey; pKey->mbIsComment = FALSE; if ( pPrevKey ) pPrevKey->mpNext = pKey; diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx index bacacac29aa6..0b8231d620ce 100644 --- a/tools/source/generic/fract.cxx +++ b/tools/source/generic/fract.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -144,7 +144,7 @@ Fraction::Fraction( long nN1, long nN2, long nD1, long nD2 ) if( nN2 < 0 ) { i = -i; nN2 = -nN2; } if( nD1 < 0 ) { i = -i; nD1 = -nD1; } if( nD2 < 0 ) { i = -i; nD2 = -nD2; } - + n = GetGGT( nN1, nD1 ); if( n > 1 ) { nN1 /= n; nD1 /= n; } n = GetGGT( nN1, nD2 ); if( n > 1 ) { nN1 /= n; nD2 /= n; } n = GetGGT( nN2, nD1 ); if( n > 1 ) { nN2 /= n; nD1 /= n; } @@ -305,7 +305,7 @@ Fraction& Fraction::operator += ( const Fraction& rVal ) BigInt nD( nDenominator ); nD *= BigInt( rVal.nDenominator ); - + Reduce( nN, nD ); if ( nN.bIsBig || nD.bIsBig ) @@ -513,7 +513,7 @@ const char nbits_table[32] = static int impl_NumberOfBits( unsigned long nNum ) { // http://en.wikipedia.org/wiki/De_Bruijn_sequence - // + // // background paper: Using de Bruijn Sequences to Index a 1 in a // Computer Word (1998) Charles E. Leiserson, // Harald Prokop, Keith H. Randall diff --git a/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx index cbc5d4405024..b0eb57f1ab73 100644 --- a/tools/source/generic/gen.cxx +++ b/tools/source/generic/gen.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,12 +39,12 @@ SvStream& operator>>( SvStream& rIStream, Pair& rPair ) if ( rIStream.GetCompressMode() == COMPRESSMODE_FULL ) { - unsigned char cId; - unsigned char cAry[8]; - int i; - int i1; - int i2; - UINT32 nNum; + unsigned char cId; + unsigned char cAry[8]; + int i; + int i1; + int i2; + UINT32 nNum; rIStream >> cId; i1 = (cId & 0x70) >> 4; @@ -91,9 +91,9 @@ SvStream& operator<<( SvStream& rOStream, const Pair& rPair ) if ( rOStream.GetCompressMode() == COMPRESSMODE_FULL ) { - unsigned char cAry[9]; - int i = 1; - UINT32 nNum; + unsigned char cAry[9]; + int i = 1; + UINT32 nNum; cAry[0] = 0; @@ -394,15 +394,15 @@ SvStream& operator>>( SvStream& rIStream, Rectangle& rRect ) if ( rIStream.GetCompressMode() == COMPRESSMODE_FULL ) { - unsigned char cIdAry[2]; - unsigned char cAry[16]; - int i; - int iLast; - int i1; - int i2; - int i3; - int i4; - UINT32 nNum; + unsigned char cIdAry[2]; + unsigned char cAry[16]; + int i; + int iLast; + int i1; + int i2; + int i3; + int i4; + UINT32 nNum; rIStream.Read( cIdAry, 2 ); i1 = (cIdAry[0] & 0x70) >> 4; @@ -479,9 +479,9 @@ SvStream& operator<<( SvStream& rOStream, const Rectangle& rRect ) if ( rOStream.GetCompressMode() == COMPRESSMODE_FULL ) { - unsigned char cAry[18]; - int i = 2; - UINT32 nNum; + unsigned char cAry[18]; + int i = 2; + UINT32 nNum; cAry[0] = 0; cAry[1] = 0; diff --git a/tools/source/generic/line.cxx b/tools/source/generic/line.cxx index 0b0d75ea618a..0c2de98d843d 100644 --- a/tools/source/generic/line.cxx +++ b/tools/source/generic/line.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,8 +49,8 @@ double Line::GetLength() const BOOL Line::Intersection( const Line& rLine, Point& rIntersection ) const { - double fX, fY; - BOOL bRet; + double fX, fY; + BOOL bRet; if( Intersection( rLine, fX, fY ) ) { @@ -216,9 +216,9 @@ double Line::GetDistance( const double& rPtX, const double& rPtY ) const { const double fDistX = maEnd.X() - maStart.X(); const double fDistY = maEnd.Y() - maStart.Y(); - const double fACX = maStart.X() - rPtX; - const double fACY = maStart.Y() - rPtY; - const double fL2 = fDistX * fDistX + fDistY * fDistY; + const double fACX = maStart.X() - rPtX; + const double fACY = maStart.Y() - rPtY; + const double fL2 = fDistX * fDistX + fDistY * fDistY; const double fR = ( fACY * -fDistY - fACX * fDistX ) / fL2; const double fS = ( fACY * fDistX - fACX * fDistY ) / fL2; @@ -227,7 +227,7 @@ double Line::GetDistance( const double& rPtX, const double& rPtY ) const fDist = hypot( maStart.X() - rPtX, maStart.Y() - rPtY ); if( fS < 0.0 ) - fDist *= -1.0; + fDist *= -1.0; } else if( fR <= 1.0 ) fDist = fS * sqrt( fL2 ); @@ -236,7 +236,7 @@ double Line::GetDistance( const double& rPtX, const double& rPtY ) const fDist = hypot( maEnd.X() - rPtX, maEnd.Y() - rPtY ); if( fS < 0.0 ) - fDist *= -1.0; + fDist *= -1.0; } } else @@ -311,12 +311,12 @@ void Line::Enum( const Link& rEnumLink ) { const long nDX = labs( maEnd.X() - maStart.X() ); const long nDY = labs( maEnd.Y() - maStart.Y() ); - const long nStartX = maStart.X(); - const long nStartY = maStart.Y(); - const long nEndX = maEnd.X(); - const long nEndY = maEnd.Y(); - const long nXInc = ( nStartX < nEndX ) ? 1L : -1L; - const long nYInc = ( nStartY < nEndY ) ? 1L : -1L; + const long nStartX = maStart.X(); + const long nStartY = maStart.Y(); + const long nEndX = maEnd.X(); + const long nEndY = maEnd.Y(); + const long nXInc = ( nStartX < nEndX ) ? 1L : -1L; + const long nYInc = ( nStartY < nEndY ) ? 1L : -1L; if( nDX >= nDY ) { diff --git a/tools/source/generic/link.cxx b/tools/source/generic/link.cxx index 349b2169460b..928251306901 100644 --- a/tools/source/generic/link.cxx +++ b/tools/source/generic/link.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx index 9cdf591d15b4..e9f98b07adbd 100644 --- a/tools/source/generic/poly.cxx +++ b/tools/source/generic/poly.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,14 +62,14 @@ DBG_NAME( Polygon ) // ----------------------------------------------------------------------- -#define EDGE_LEFT 1 -#define EDGE_TOP 2 -#define EDGE_RIGHT 4 -#define EDGE_BOTTOM 8 -#define EDGE_HORZ (EDGE_RIGHT | EDGE_LEFT) -#define EDGE_VERT (EDGE_TOP | EDGE_BOTTOM) -#define SMALL_DVALUE 0.0000001 -#define FSQRT2 1.4142135623730950488016887242097 +#define EDGE_LEFT 1 +#define EDGE_TOP 2 +#define EDGE_RIGHT 4 +#define EDGE_BOTTOM 8 +#define EDGE_HORZ (EDGE_RIGHT | EDGE_LEFT) +#define EDGE_VERT (EDGE_TOP | EDGE_BOTTOM) +#define SMALL_DVALUE 0.0000001 +#define FSQRT2 1.4142135623730950488016887242097 // ----------------------------------------------------------------------- @@ -242,13 +242,13 @@ void ImplPolygon::ImplSetSize( USHORT nNewSize, BOOL bResize ) void ImplPolygon::ImplSplit( USHORT nPos, USHORT nSpace, ImplPolygon* pInitPoly ) { - const ULONG nSpaceSize = nSpace * sizeof( Point ); + const ULONG nSpaceSize = nSpace * sizeof( Point ); //Can't fit this in :-(, throw ? if (mnPoints + nSpace > USHRT_MAX) return; - const USHORT nNewSize = mnPoints + nSpace; + const USHORT nNewSize = mnPoints + nSpace; if( nPos >= mnPoints ) { @@ -267,8 +267,8 @@ void ImplPolygon::ImplSplit( USHORT nPos, USHORT nSpace, ImplPolygon* pInitPoly else { // PointArray ist in diesem Zweig immer vorhanden - const USHORT nSecPos = nPos + nSpace; - const USHORT nRest = mnPoints - nPos; + const USHORT nSecPos = nPos + nSpace; + const USHORT nRest = mnPoints - nPos; Point* pNewAry = (Point*) new char[ (ULONG) nNewSize * sizeof( Point ) ]; @@ -312,9 +312,9 @@ void ImplPolygon::ImplRemove( USHORT nPos, USHORT nCount ) if( nRemoveCount ) { - const USHORT nNewSize = mnPoints - nRemoveCount; - const USHORT nSecPos = nPos + nRemoveCount; - const USHORT nRest = mnPoints - nSecPos; + const USHORT nNewSize = mnPoints - nRemoveCount; + const USHORT nSecPos = nPos + nRemoveCount; + const USHORT nRest = mnPoints - nSecPos; Point* pNewAry = (Point*) new char[ (ULONG) nNewSize * sizeof( Point ) ]; @@ -446,7 +446,7 @@ Polygon::Polygon( const Rectangle& rRect, ULONG nHorzRound, ULONG nVertRound ) else { Rectangle aRect( rRect ); - aRect.Justify(); // SJ: i9140 + aRect.Justify(); // SJ: i9140 nHorzRound = Min( nHorzRound, (ULONG) labs( aRect.GetWidth() >> 1 ) ); nVertRound = Min( nVertRound, (ULONG) labs( aRect.GetHeight() >> 1 ) ); @@ -462,17 +462,17 @@ Polygon::Polygon( const Rectangle& rRect, ULONG nHorzRound, ULONG nVertRound ) } else { - const Point aTL( aRect.Left() + nHorzRound, aRect.Top() + nVertRound ); - const Point aTR( aRect.Right() - nHorzRound, aRect.Top() + nVertRound ); - const Point aBR( aRect.Right() - nHorzRound, aRect.Bottom() - nVertRound ); - const Point aBL( aRect.Left() + nHorzRound, aRect.Bottom() - nVertRound ); - Polygon* pEllipsePoly = new Polygon( Point(), nHorzRound, nVertRound ); - USHORT i, nEnd, nSize4 = pEllipsePoly->GetSize() >> 2; + const Point aTL( aRect.Left() + nHorzRound, aRect.Top() + nVertRound ); + const Point aTR( aRect.Right() - nHorzRound, aRect.Top() + nVertRound ); + const Point aBR( aRect.Right() - nHorzRound, aRect.Bottom() - nVertRound ); + const Point aBL( aRect.Left() + nHorzRound, aRect.Bottom() - nVertRound ); + Polygon* pEllipsePoly = new Polygon( Point(), nHorzRound, nVertRound ); + USHORT i, nEnd, nSize4 = pEllipsePoly->GetSize() >> 2; mpImplPolygon = new ImplPolygon( pEllipsePoly->GetSize() + 1 ); - - const Point* pSrcAry = pEllipsePoly->GetConstPointAry(); - Point* pDstAry = mpImplPolygon->mpPointAry; + + const Point* pSrcAry = pEllipsePoly->GetConstPointAry(); + Point* pDstAry = mpImplPolygon->mpPointAry; for( i = 0, nEnd = nSize4; i < nEnd; i++ ) ( pDstAry[ i ] = pSrcAry[ i ] ) += aTR; @@ -528,16 +528,16 @@ Polygon::Polygon( const Point& rCenter, long nRadX, long nRadY, USHORT nPoints ) long nY = FRound( -nRadY * sin( nAngle ) ); pPt = &(mpImplPolygon->mpPointAry[i]); - pPt->X() = nX + rCenter.X(); - pPt->Y() = nY + rCenter.Y(); + pPt->X() = nX + rCenter.X(); + pPt->Y() = nY + rCenter.Y(); pPt = &(mpImplPolygon->mpPointAry[nPoints2-i-1]); pPt->X() = -nX + rCenter.X(); - pPt->Y() = nY + rCenter.Y(); + pPt->Y() = nY + rCenter.Y(); pPt = &(mpImplPolygon->mpPointAry[i+nPoints2]); pPt->X() = -nX + rCenter.X(); pPt->Y() = -nY + rCenter.Y(); pPt = &(mpImplPolygon->mpPointAry[nPoints-i-1]); - pPt->X() = nX + rCenter.X(); + pPt->X() = nX + rCenter.X(); pPt->Y() = -nY + rCenter.Y(); } } @@ -552,15 +552,15 @@ Polygon::Polygon( const Rectangle& rBound, { DBG_CTOR( Polygon, NULL ); - const long nWidth = rBound.GetWidth(); - const long nHeight = rBound.GetHeight(); + const long nWidth = rBound.GetWidth(); + const long nHeight = rBound.GetHeight(); if( ( nWidth > 1 ) && ( nHeight > 1 ) ) { const Point aCenter( rBound.Center() ); - const long nRadX = aCenter.X() - rBound.Left(); - const long nRadY = aCenter.Y() - rBound.Top(); - USHORT nPoints; + const long nRadX = aCenter.X() - rBound.Left(); + const long nRadY = aCenter.Y() - rBound.Top(); + USHORT nPoints; nPoints = (USHORT) ( F_PI * ( 1.5 * ( nRadX + nRadY ) - sqrt( (double) labs( nRadX * nRadY ) ) ) ); @@ -571,16 +571,16 @@ Polygon::Polygon( const Rectangle& rBound, nPoints >>= 1; // Winkel berechnen - const double fRadX = nRadX; - const double fRadY = nRadY; - const double fCenterX = aCenter.X(); - const double fCenterY = aCenter.Y(); - double fStart = ImplGetAngle( aCenter, rStart ); - double fEnd = ImplGetAngle( aCenter, rEnd ); - double fDiff = fEnd - fStart; - double fStep; - USHORT nStart; - USHORT nEnd; + const double fRadX = nRadX; + const double fRadY = nRadY; + const double fCenterX = aCenter.X(); + const double fCenterY = aCenter.Y(); + double fStart = ImplGetAngle( aCenter, rStart ); + double fEnd = ImplGetAngle( aCenter, rEnd ); + double fDiff = fEnd - fStart; + double fStep; + USHORT nStart; + USHORT nEnd; if( fDiff < 0. ) fDiff += F_2PI; @@ -625,25 +625,25 @@ Polygon::Polygon( const Rectangle& rBound, // ----------------------------------------------------------------------- -Polygon::Polygon( const Point& rBezPt1, const Point& rCtrlPt1, +Polygon::Polygon( const Point& rBezPt1, const Point& rCtrlPt1, const Point& rBezPt2, const Point& rCtrlPt2, USHORT nPoints ) { DBG_CTOR( Polygon, NULL ); - + nPoints = ( 0 == nPoints ) ? 25 : ( ( nPoints < 2 ) ? 2 : nPoints ); - const double fInc = 1.0 / ( nPoints - 1 ); - double fK_1 = 0.0, fK1_1 = 1.0; - double fK_2, fK_3, fK1_2, fK1_3, fK12, fK21; - const double fX0 = rBezPt1.X(); - const double fY0 = rBezPt1.Y(); - const double fX1 = 3.0 * rCtrlPt1.X(); - const double fY1 = 3.0 * rCtrlPt1.Y(); - const double fX2 = 3.0 * rCtrlPt2.X();; - const double fY2 = 3.0 * rCtrlPt2.Y();; - const double fX3 = rBezPt2.X(); - const double fY3 = rBezPt2.Y(); + const double fInc = 1.0 / ( nPoints - 1 ); + double fK_1 = 0.0, fK1_1 = 1.0; + double fK_2, fK_3, fK1_2, fK1_3, fK12, fK21; + const double fX0 = rBezPt1.X(); + const double fY0 = rBezPt1.Y(); + const double fX1 = 3.0 * rCtrlPt1.X(); + const double fY1 = 3.0 * rCtrlPt1.Y(); + const double fX2 = 3.0 * rCtrlPt2.X();; + const double fY2 = 3.0 * rCtrlPt2.Y();; + const double fX3 = rBezPt2.X(); + const double fY3 = rBezPt2.Y(); mpImplPolygon = new ImplPolygon( nPoints ); @@ -825,7 +825,7 @@ BOOL Polygon::IsRect() const void Polygon::SetSize( USHORT nNewSize ) { DBG_CHKTHIS( Polygon, NULL ); - + if( nNewSize != mpImplPolygon->mnPoints ) { ImplMakeUnique(); @@ -889,18 +889,18 @@ void Polygon::Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData ) { if( nOptimizeFlags & POLY_OPTIMIZE_EDGES ) { - const Rectangle aBound( GetBoundRect() ); - const double fArea = ( aBound.GetWidth() + aBound.GetHeight() ) * 0.5; - const USHORT nPercent = pData ? pData->GetPercentValue() : 50; + const Rectangle aBound( GetBoundRect() ); + const double fArea = ( aBound.GetWidth() + aBound.GetHeight() ) * 0.5; + const USHORT nPercent = pData ? pData->GetPercentValue() : 50; Optimize( POLY_OPTIMIZE_NO_SAME ); ImplReduceEdges( *this, fArea, nPercent ); } else if( nOptimizeFlags & ( POLY_OPTIMIZE_REDUCE | POLY_OPTIMIZE_NO_SAME ) ) { - Polygon aNewPoly; - const Point& rFirst = mpImplPolygon->mpPointAry[ 0 ]; - ULONG nReduce; + Polygon aNewPoly; + const Point& rFirst = mpImplPolygon->mpPointAry[ 0 ]; + ULONG nReduce; if( nOptimizeFlags & ( POLY_OPTIMIZE_REDUCE ) ) nReduce = pData ? pData->GetAbsValue() : 4UL; @@ -939,13 +939,13 @@ void Polygon::Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData ) if( nSize > 1 ) { - if( ( nOptimizeFlags & POLY_OPTIMIZE_CLOSE ) && + if( ( nOptimizeFlags & POLY_OPTIMIZE_CLOSE ) && ( mpImplPolygon->mpPointAry[ 0 ] != mpImplPolygon->mpPointAry[ nSize - 1 ] ) ) { SetSize( mpImplPolygon->mnPoints + 1 ); mpImplPolygon->mpPointAry[ mpImplPolygon->mnPoints - 1 ] = mpImplPolygon->mpPointAry[ 0 ]; } - else if( ( nOptimizeFlags & POLY_OPTIMIZE_OPEN ) && + else if( ( nOptimizeFlags & POLY_OPTIMIZE_OPEN ) && ( mpImplPolygon->mpPointAry[ 0 ] == mpImplPolygon->mpPointAry[ nSize - 1 ] ) ) { const Point& rFirst = mpImplPolygon->mpPointAry[ 0 ]; @@ -961,8 +961,8 @@ void Polygon::Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData ) // ======================================================================= -/* Recursively subdivide cubic bezier curve via deCasteljau. - +/* Recursively subdivide cubic bezier curve via deCasteljau. + @param rPointIter Output iterator, where the subdivided polylines are written to. @@ -972,8 +972,8 @@ void Polygon::Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData ) @param P* Exactly four points, interpreted as support and control points of a cubic bezier curve. Must be in device coordinates, since stop - criterion is based on the following assumption: the device has a - finite resolution, it is thus sufficient to stop subdivision if the + criterion is based on the following assumption: the device has a + finite resolution, it is thus sufficient to stop subdivision if the curve does not deviate more than one pixel from a straight line. */ @@ -1003,7 +1003,7 @@ static void ImplAdaptiveSubdivide( ::std::back_insert_iterator< ::std::vector< P const double fJ1y( P2y - P1y - 1.0/3.0*(P4y - P1y) ); const double fJ2x( P3x - P1x - 2.0/3.0*(P4x - P1x) ); const double fJ2y( P3y - P1y - 2.0/3.0*(P4y - P1y) ); - const double distance2( ::std::max( fJ1x*fJ1x + fJ1y*fJ1y, + const double distance2( ::std::max( fJ1x*fJ1x + fJ1y*fJ1y, fJ2x*fJ2x + fJ2y*fJ2y) ); // stop if error measure does not improve anymore. This is a @@ -1017,15 +1017,15 @@ static void ImplAdaptiveSubdivide( ::std::back_insert_iterator< ::std::vector< P { // deCasteljau bezier arc, split at t=0.5 // Foley/vanDam, p. 508 - const double L1x( P1x ), L1y( P1y ); + const double L1x( P1x ), L1y( P1y ); const double L2x( (P1x + P2x)*0.5 ), L2y( (P1y + P2y)*0.5 ); const double Hx ( (P2x + P3x)*0.5 ), Hy ( (P2y + P3y)*0.5 ); const double L3x( (L2x + Hx)*0.5 ), L3y( (L2y + Hy)*0.5 ); - const double R4x( P4x ), R4y( P4y ); + const double R4x( P4x ), R4y( P4y ); const double R3x( (P3x + P4x)*0.5 ), R3y( (P3y + P4y)*0.5 ); const double R2x( (Hx + R3x)*0.5 ), R2y( (Hy + R3y)*0.5 ); const double R1x( (L3x + R2x)*0.5 ), R1y( (L3y + R2y)*0.5 ); - const double L4x( R1x ), L4y( R1y ); + const double L4x( R1x ), L4y( R1y ); // subdivide further ++recursionDepth; @@ -1060,7 +1060,7 @@ void Polygon::AdaptiveSubdivide( Polygon& rResult, const double d ) const for(i=0; i<nPts;) { if( ( i + 3 ) < nPts ) - { + { BYTE P1( mpImplPolygon->mpFlagAry[ i ] ); BYTE P4( mpImplPolygon->mpFlagAry[ i + 3 ] ); @@ -1098,7 +1098,7 @@ void Polygon::GetIntersection( const PolyPolygon& rPolyPoly, PolyPolygon& rResul // ----------------------------------------------------------------------- -void Polygon::GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const +void Polygon::GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const { const PolyPolygon aTmp( *this ); aTmp.GetUnion( rPolyPoly, rResult ); @@ -1124,14 +1124,14 @@ void Polygon::GetXOR( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const void Polygon::ImplReduceEdges( Polygon& rPoly, const double& rArea, USHORT nPercent ) { - const double fBound = 2000.0 * ( 100 - nPercent ) * 0.01; - USHORT nNumNoChange = 0, nNumRuns = 0; + const double fBound = 2000.0 * ( 100 - nPercent ) * 0.01; + USHORT nNumNoChange = 0, nNumRuns = 0; - while( nNumNoChange < 2 ) + while( nNumNoChange < 2 ) { - USHORT nPntCnt = rPoly.GetSize(), nNewPos = 0; - Polygon aNewPoly( nPntCnt ); - BOOL bChangeInThisRun = FALSE; + USHORT nPntCnt = rPoly.GetSize(), nNewPos = 0; + Polygon aNewPoly( nPntCnt ); + BOOL bChangeInThisRun = FALSE; for( USHORT n = 0; n < nPntCnt; n++ ) { @@ -1139,29 +1139,29 @@ void Polygon::ImplReduceEdges( Polygon& rPoly, const double& rArea, USHORT nPerc if( ( n + nNumRuns ) % 2 ) { - USHORT nIndPrev = !n ? nPntCnt - 1 : n - 1; - USHORT nIndPrevPrev = !nIndPrev ? nPntCnt - 1 : nIndPrev - 1; - USHORT nIndNext = ( n == nPntCnt-1 ) ? 0 : n + 1; - USHORT nIndNextNext = ( nIndNext == nPntCnt - 1 ) ? 0 : nIndNext + 1; - Vector2D aVec1( rPoly[ nIndPrev ] ); aVec1 -= rPoly[ nIndPrevPrev ]; - Vector2D aVec2( rPoly[ n ] ); aVec2 -= rPoly[ nIndPrev ]; - Vector2D aVec3( rPoly[ nIndNext ] ); aVec3 -= rPoly[ n ]; - Vector2D aVec4( rPoly[ nIndNextNext ] ); aVec4 -= rPoly[ nIndNext ]; - double fDist1 = aVec1.GetLength(), fDist2 = aVec2.GetLength(); - double fDist3 = aVec3.GetLength(), fDist4 = aVec4.GetLength(); - double fTurnB = aVec2.Normalize().Scalar( aVec3.Normalize() ); + USHORT nIndPrev = !n ? nPntCnt - 1 : n - 1; + USHORT nIndPrevPrev = !nIndPrev ? nPntCnt - 1 : nIndPrev - 1; + USHORT nIndNext = ( n == nPntCnt-1 ) ? 0 : n + 1; + USHORT nIndNextNext = ( nIndNext == nPntCnt - 1 ) ? 0 : nIndNext + 1; + Vector2D aVec1( rPoly[ nIndPrev ] ); aVec1 -= rPoly[ nIndPrevPrev ]; + Vector2D aVec2( rPoly[ n ] ); aVec2 -= rPoly[ nIndPrev ]; + Vector2D aVec3( rPoly[ nIndNext ] ); aVec3 -= rPoly[ n ]; + Vector2D aVec4( rPoly[ nIndNextNext ] ); aVec4 -= rPoly[ nIndNext ]; + double fDist1 = aVec1.GetLength(), fDist2 = aVec2.GetLength(); + double fDist3 = aVec3.GetLength(), fDist4 = aVec4.GetLength(); + double fTurnB = aVec2.Normalize().Scalar( aVec3.Normalize() ); if( fabs( fTurnB ) < ( 1.0 + SMALL_DVALUE ) && fabs( fTurnB ) > ( 1.0 - SMALL_DVALUE ) ) bDeletePoint = TRUE; else { - Vector2D aVecB( rPoly[ nIndNext ] ); - double fDistB = ( aVecB -= rPoly[ nIndPrev ] ).GetLength(); - double fLenWithB = fDist2 + fDist3; - double fLenFact = ( fDistB != 0.0 ) ? fLenWithB / fDistB : 1.0; - double fTurnPrev = aVec1.Normalize().Scalar( aVec2 ); - double fTurnNext = aVec3.Scalar( aVec4.Normalize() ); - double fGradPrev, fGradB, fGradNext; + Vector2D aVecB( rPoly[ nIndNext ] ); + double fDistB = ( aVecB -= rPoly[ nIndPrev ] ).GetLength(); + double fLenWithB = fDist2 + fDist3; + double fLenFact = ( fDistB != 0.0 ) ? fLenWithB / fDistB : 1.0; + double fTurnPrev = aVec1.Normalize().Scalar( aVec2 ); + double fTurnNext = aVec3.Scalar( aVec4.Normalize() ); + double fGradPrev, fGradB, fGradNext; if( fabs( fTurnPrev ) < ( 1.0 + SMALL_DVALUE ) && fabs( fTurnPrev ) > ( 1.0 - SMALL_DVALUE ) ) fGradPrev = 0.0; @@ -1175,7 +1175,7 @@ void Polygon::ImplReduceEdges( Polygon& rPoly, const double& rArea, USHORT nPerc else fGradNext = acos( fTurnNext ) / ( aVec3.IsNegative( aVec4 ) ? -F_PI180 : F_PI180 ); - if( ( fGradPrev > 0.0 && fGradB < 0.0 && fGradNext > 0.0 ) || + if( ( fGradPrev > 0.0 && fGradB < 0.0 && fGradNext > 0.0 ) || ( fGradPrev < 0.0 && fGradB > 0.0 && fGradNext < 0.0 ) ) { if( ( fLenFact < ( FSQRT2 + SMALL_DVALUE ) ) && @@ -1193,7 +1193,7 @@ void Polygon::ImplReduceEdges( Polygon& rPoly, const double& rArea, USHORT nPerc else if( fRelLen > 1.0 ) fRelLen = 1.0; - if( ( (UINT32) ( ( ( fLenFact - 1.0 ) * 1000000.0 ) + 0.5 ) < fBound ) && + if( ( (UINT32) ( ( ( fLenFact - 1.0 ) * 1000000.0 ) + 0.5 ) < fBound ) && ( fabs( fGradB ) <= ( fRelLen * fBound * 0.01 ) ) ) { bDeletePoint = TRUE; @@ -1314,8 +1314,8 @@ void Polygon::SlantX( long nYRef, double fSin, double fCos ) for( USHORT i = 0, nCount = mpImplPolygon->mnPoints; i < nCount; i++ ) { - Point& rPnt = mpImplPolygon->mpPointAry[ i ]; - const long nDy = rPnt.Y() - nYRef; + Point& rPnt = mpImplPolygon->mpPointAry[ i ]; + const long nDy = rPnt.Y() - nYRef; rPnt.X() += (long)( fSin * nDy ); rPnt.Y() = nYRef + (long)( fCos * nDy ); @@ -1331,8 +1331,8 @@ void Polygon::SlantY( long nXRef, double fSin, double fCos ) for( USHORT i = 0, nCount = mpImplPolygon->mnPoints; i < nCount; i++ ) { - Point& rPnt = mpImplPolygon->mpPointAry[ i ]; - const long nDx = rPnt.X() - nXRef; + Point& rPnt = mpImplPolygon->mpPointAry[ i ]; + const long nDx = rPnt.X() - nXRef; rPnt.X() = nXRef + (long)( fCos * nDx ); rPnt.Y() -= (long)( fSin * nDx ); @@ -1346,9 +1346,9 @@ void Polygon::Distort( const Rectangle& rRefRect, const Polygon& rDistortedRect DBG_CHKTHIS( Polygon, NULL ); ImplMakeUnique(); - long Xr, Wr, X1, X2, X3, X4; - long Yr, Hr, Y1, Y2, Y3, Y4; - double fTx, fTy, fUx, fUy; + long Xr, Wr, X1, X2, X3, X4; + long Yr, Hr, Y1, Y2, Y3, Y4; + double fTx, fTy, fUx, fUy; Xr = rRefRect.Left(); Yr = rRefRect.Top(); @@ -1395,8 +1395,8 @@ public: class ImplPolygonPointFilter : public ImplPointFilter { public: - ImplPolygon* mpPoly; // Nicht loeschen, wird dem Polygon zugewiesen - USHORT mnSize; + ImplPolygon* mpPoly; // Nicht loeschen, wird dem Polygon zugewiesen + USHORT mnSize; ImplPolygonPointFilter( USHORT nDestSize ) : mnSize( 0 ) @@ -1404,8 +1404,8 @@ public: mpPoly = new ImplPolygon( nDestSize ); } - virtual void LastPoint(); - virtual void Input( const Point& rPoint ); + virtual void LastPoint(); + virtual void Input( const Point& rPoint ); }; void ImplPolygonPointFilter::Input( const Point& rPoint ) @@ -1427,14 +1427,14 @@ void ImplPolygonPointFilter::LastPoint() class ImplEdgePointFilter : public ImplPointFilter { - Point maFirstPoint; - Point maLastPoint; - ImplPointFilter& mrNextFilter; - const long mnLow; - const long mnHigh; - const int mnEdge; - int mnLastOutside; - BOOL mbFirst; + Point maFirstPoint; + Point maLastPoint; + ImplPointFilter& mrNextFilter; + const long mnLow; + const long mnHigh; + const int mnEdge; + int mnLastOutside; + BOOL mbFirst; public: ImplEdgePointFilter( int nEdge, long nLow, long nHigh, @@ -1447,13 +1447,13 @@ public: { } - Point EdgeSection( const Point& rPoint, int nEdge ) const; - int VisibleSide( const Point& rPoint ) const; - int IsPolygon() const + Point EdgeSection( const Point& rPoint, int nEdge ) const; + int VisibleSide( const Point& rPoint ) const; + int IsPolygon() const { return maFirstPoint == maLastPoint; } - virtual void Input( const Point& rPoint ); - virtual void LastPoint(); + virtual void Input( const Point& rPoint ); + virtual void LastPoint(); }; inline int ImplEdgePointFilter::VisibleSide( const Point& rPoint ) const @@ -1542,7 +1542,7 @@ void ImplEdgePointFilter::Input( const Point& rPoint ) if ( mbFirst ) { maFirstPoint = rPoint; - mbFirst = FALSE; + mbFirst = FALSE; if ( !nOutside ) mrNextFilter.Input( rPoint ); } @@ -1583,14 +1583,14 @@ void ImplEdgePointFilter::LastPoint() void Polygon::Clip( const Rectangle& rRect, BOOL bPolygon ) { // #105251# Justify rect befor edge filtering - Rectangle aJustifiedRect( rRect ); + Rectangle aJustifiedRect( rRect ); aJustifiedRect.Justify(); - USHORT nSourceSize = mpImplPolygon->mnPoints; - ImplPolygonPointFilter aPolygon( nSourceSize ); - ImplEdgePointFilter aHorzFilter( EDGE_HORZ, aJustifiedRect.Left(), aJustifiedRect.Right(), + USHORT nSourceSize = mpImplPolygon->mnPoints; + ImplPolygonPointFilter aPolygon( nSourceSize ); + ImplEdgePointFilter aHorzFilter( EDGE_HORZ, aJustifiedRect.Left(), aJustifiedRect.Right(), aPolygon ); - ImplEdgePointFilter aVertFilter( EDGE_VERT, aJustifiedRect.Top(), aJustifiedRect.Bottom(), + ImplEdgePointFilter aVertFilter( EDGE_VERT, aJustifiedRect.Top(), aJustifiedRect.Bottom(), aHorzFilter ); for ( USHORT i = 0; i < nSourceSize; i++ ) @@ -1619,7 +1619,7 @@ Rectangle Polygon::GetBoundRect() const DBG_CHKTHIS( Polygon, NULL ); // Removing the assert. Bezier curves have the attribute that each single // curve segment defined by four points can not exit the four-point polygon - // defined by that points. This allows to say that the curve segment can also + // defined by that points. This allows to say that the curve segment can also // never leave the Range of it's defining points. // The result is that Polygon::GetBoundRect() may not create the minimal // BoundRect of the Polygon (to get that, use basegfx::B2DPolygon classes), @@ -1628,11 +1628,11 @@ Rectangle Polygon::GetBoundRect() const // // DBG_ASSERT( !mpImplPolygon->mpFlagAry, "GetBoundRect could fail with beziers!" ); - USHORT nCount = mpImplPolygon->mnPoints; + USHORT nCount = mpImplPolygon->mnPoints; if( ! nCount ) return Rectangle(); - long nXMin, nXMax, nYMin, nYMax; + long nXMin, nXMax, nYMin, nYMax; const Point* pPt = &(mpImplPolygon->mpPointAry[0]); nXMin = nXMax = pPt->X(); @@ -1641,7 +1641,7 @@ Rectangle Polygon::GetBoundRect() const for ( USHORT i = 0; i < nCount; i++ ) { pPt = &(mpImplPolygon->mpPointAry[i]); - + if ( pPt->X() < nXMin ) nXMin = pPt->X(); if ( pPt->X() > nXMax ) @@ -1699,15 +1699,15 @@ BOOL Polygon::IsInside( const Point& rPoint ) const DBG_ASSERT( !mpImplPolygon->mpFlagAry, "IsInside could fail with beziers!" ); const Rectangle aBound( GetBoundRect() ); - const Line aLine( rPoint, Point( aBound.Right() + 100L, rPoint.Y() ) ); - USHORT nCount = mpImplPolygon->mnPoints; - USHORT nPCounter = 0; + const Line aLine( rPoint, Point( aBound.Right() + 100L, rPoint.Y() ) ); + USHORT nCount = mpImplPolygon->mnPoints; + USHORT nPCounter = 0; if ( ( nCount > 2 ) && aBound.IsInside( rPoint ) ) { - Point aPt1( mpImplPolygon->mpPointAry[ 0 ] ); - Point aIntersection; - Point aLastIntersection; + Point aPt1( mpImplPolygon->mpPointAry[ 0 ] ); + Point aIntersection; + Point aLastIntersection; while ( ( aPt1 == mpImplPolygon->mpPointAry[ nCount - 1 ] ) && ( nCount > 3 ) ) nCount--; @@ -1885,15 +1885,15 @@ SvStream& operator>>( SvStream& rIStream, Polygon& rPoly ) DBG_CHKOBJ( &rPoly, Polygon, NULL ); DBG_ASSERTWARNING( rIStream.GetVersion(), "Polygon::>> - Solar-Version not set on rIStream" ); - USHORT i; - USHORT nStart; - USHORT nCurPoints; - USHORT nPoints; - unsigned char bShort; - short nShortX; - short nShortY; - long nLongX; - long nLongY; + USHORT i; + USHORT nStart; + USHORT nCurPoints; + USHORT nPoints; + unsigned char bShort; + short nShortX; + short nShortY; + long nLongX; + long nLongY; // Anzahl der Punkte einlesen und Array erzeugen rIStream >> nPoints; @@ -1967,11 +1967,11 @@ SvStream& operator<<( SvStream& rOStream, const Polygon& rPoly ) DBG_CHKOBJ( &rPoly, Polygon, NULL ); DBG_ASSERTWARNING( rOStream.GetVersion(), "Polygon::<< - Solar-Version not set on rOStream" ); - unsigned char bShort; - unsigned char bCurShort; - USHORT nStart; - USHORT i; - USHORT nPoints = rPoly.GetSize(); + unsigned char bShort; + unsigned char bCurShort; + USHORT nStart; + USHORT i; + USHORT nPoints = rPoly.GetSize(); // Anzahl der Punkte rausschreiben rOStream << nPoints; @@ -2067,7 +2067,7 @@ SvStream& operator<<( SvStream& rOStream, const Polygon& rPoly ) void Polygon::ImplRead( SvStream& rIStream ) { - sal_uInt8 bHasPolyFlags; + sal_uInt8 bHasPolyFlags; rIStream >> *this >> bHasPolyFlags; @@ -2092,7 +2092,7 @@ void Polygon::Read( SvStream& rIStream ) void Polygon::ImplWrite( SvStream& rOStream ) const { - sal_uInt8 bHasPolyFlags = mpImplPolygon->mpFlagAry != NULL; + sal_uInt8 bHasPolyFlags = mpImplPolygon->mpFlagAry != NULL; rOStream << *this << bHasPolyFlags; @@ -2203,7 +2203,7 @@ basegfx::B2DPolygon Polygon::getB2DPolygon() const // if exist, remove double first/last points, set closed and correct control points basegfx::tools::checkClosed(aRetval); - + if(aRetval.isClosed()) { // closeWithGeometryChange did really close, so last point(s) were removed. @@ -2237,7 +2237,7 @@ basegfx::B2DPolygon Polygon::getB2DPolygon() const // and a memcopy at ImplPolygon creation, but contains no zero-controlpoints // for straight edges. Polygon::Polygon(const basegfx::B2DPolygon& rPolygon) -: mpImplPolygon(0) +: mpImplPolygon(0) { DBG_CTOR( Polygon, NULL ); @@ -2332,7 +2332,7 @@ Polygon::Polygon(const basegfx::B2DPolygon& rPolygon) } DBG_ASSERT(nArrayInsert <= nMaxTargetCount, "Polygon::Polygon from basegfx::B2DPolygon: wrong max point count estimation (!)"); - + if(nArrayInsert != nMaxTargetCount) { mpImplPolygon->ImplSetSize(static_cast< sal_uInt16 >(nArrayInsert), true); diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx index c85e2c1488f2..46459353fa35 100644 --- a/tools/source/generic/poly2.cxx +++ b/tools/source/generic/poly2.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,21 +55,21 @@ DBG_NAME( PolyPolygon ) ImplPolyPolygon::ImplPolyPolygon( USHORT nInitSize ) { - mnRefCount = 1; - mnCount = nInitSize; - mnSize = nInitSize; - mnResize = 16; - mpPolyAry = new SVPPOLYGON[ nInitSize ]; + mnRefCount = 1; + mnCount = nInitSize; + mnSize = nInitSize; + mnResize = 16; + mpPolyAry = new SVPPOLYGON[ nInitSize ]; } // ----------------------------------------------------------------------- ImplPolyPolygon::ImplPolyPolygon( const ImplPolyPolygon& rImplPolyPoly ) { - mnRefCount = 1; - mnCount = rImplPolyPoly.mnCount; - mnSize = rImplPolyPoly.mnSize; - mnResize = rImplPolyPoly.mnResize; + mnRefCount = 1; + mnCount = rImplPolyPoly.mnCount; + mnSize = rImplPolyPoly.mnSize; + mnResize = rImplPolyPoly.mnResize; if ( rImplPolyPoly.mpPolyAry ) { @@ -190,8 +190,8 @@ void PolyPolygon::Insert( const Polygon& rPoly, USHORT nPos ) mpImplPolyPolygon->mpPolyAry = new SVPPOLYGON[mpImplPolyPolygon->mnSize]; else if ( mpImplPolyPolygon->mnCount == mpImplPolyPolygon->mnSize ) { - USHORT nOldSize = mpImplPolyPolygon->mnSize; - USHORT nNewSize = nOldSize + mpImplPolyPolygon->mnResize; + USHORT nOldSize = mpImplPolyPolygon->mnSize; + USHORT nNewSize = nOldSize + mpImplPolyPolygon->mnResize; SVPPOLYGON* pNewAry; if ( nNewSize >= MAX_POLYGONS ) @@ -292,8 +292,8 @@ void PolyPolygon::Clear() delete mpImplPolyPolygon->mpPolyAry[i]; delete[] mpImplPolyPolygon->mpPolyAry; mpImplPolyPolygon->mpPolyAry = NULL; - mpImplPolyPolygon->mnCount = 0; - mpImplPolyPolygon->mnSize = mpImplPolyPolygon->mnResize; + mpImplPolyPolygon->mnCount = 0; + mpImplPolyPolygon->mnSize = mpImplPolyPolygon->mnResize; } } } @@ -306,9 +306,9 @@ void PolyPolygon::Optimize( ULONG nOptimizeFlags, const PolyOptimizeData* pData if( nOptimizeFlags ) { - double fArea; - const BOOL bEdges = ( nOptimizeFlags & POLY_OPTIMIZE_EDGES ) == POLY_OPTIMIZE_EDGES; - USHORT nPercent = 0; + double fArea; + const BOOL bEdges = ( nOptimizeFlags & POLY_OPTIMIZE_EDGES ) == POLY_OPTIMIZE_EDGES; + USHORT nPercent = 0; if( bEdges ) { @@ -361,7 +361,7 @@ void PolyPolygon::AdaptiveSubdivide( PolyPolygon& rResult, const double d ) cons // ----------------------------------------------------------------------- void PolyPolygon::GetIntersection( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const -{ +{ ImplDoOperation( rPolyPoly, rResult, POLY_CLIP_INT ); } @@ -389,7 +389,7 @@ void PolyPolygon::GetXOR( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) c // ----------------------------------------------------------------------- void PolyPolygon::ImplDoOperation( const PolyPolygon& rPolyPoly, PolyPolygon& rResult, ULONG nOperation ) const -{ +{ // Convert to B2DPolyPolygon, temporarily. It might be // advantageous in the future, to have a PolyPolygon adaptor that // just simulates a B2DPolyPolygon here... @@ -397,7 +397,7 @@ void PolyPolygon::ImplDoOperation( const PolyPolygon& rPolyPoly, PolyPolygon& rR basegfx::B2DPolyPolygon aMergePolyPolygonB( rPolyPoly.getB2DPolyPolygon() ); // normalize the two polypolygons before. Force properly oriented - // polygons. + // polygons. aMergePolyPolygonA = basegfx::tools::prepareForPolygonOperation( aMergePolyPolygonA ); aMergePolyPolygonB = basegfx::tools::prepareForPolygonOperation( aMergePolyPolygonB ); @@ -628,15 +628,15 @@ Rectangle PolyPolygon::GetBoundRect() const { DBG_CHKTHIS( PolyPolygon, NULL ); - long nXMin=0, nXMax=0, nYMin=0, nYMax=0; - BOOL bFirst = TRUE; - USHORT nPolyCount = mpImplPolyPolygon->mnCount; + long nXMin=0, nXMax=0, nYMin=0, nYMax=0; + BOOL bFirst = TRUE; + USHORT nPolyCount = mpImplPolyPolygon->mnCount; for ( USHORT n = 0; n < nPolyCount; n++ ) { - const Polygon* pPoly = mpImplPolyPolygon->mpPolyAry[n]; - const Point* pAry = pPoly->GetConstPointAry(); - USHORT nPointCount = pPoly->GetSize(); + const Polygon* pPoly = mpImplPolyPolygon->mpPolyAry[n]; + const Point* pAry = pPoly->GetConstPointAry(); + USHORT nPointCount = pPoly->GetSize(); for ( USHORT i = 0; i < nPointCount; i++ ) { @@ -746,7 +746,7 @@ SvStream& operator>>( SvStream& rIStream, PolyPolygon& rPolyPoly ) DBG_ASSERTWARNING( rIStream.GetVersion(), "PolyPolygon::>> - Solar-Version not set on rIStream" ); Polygon* pPoly; - USHORT nPolyCount; + USHORT nPolyCount; // Anzahl der Polygone einlesen rIStream >> nPolyCount; @@ -803,7 +803,7 @@ void PolyPolygon::Read( SvStream& rIStream ) DBG_ASSERTWARNING( rIStream.GetVersion(), "PolyPolygon::>> - Solar-Version not set on rIStream" ); Polygon* pPoly; - USHORT nPolyCount; + USHORT nPolyCount; // Anzahl der Polygone einlesen rIStream >> nPolyCount; @@ -869,7 +869,7 @@ PolyPolygon::PolyPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon) { DBG_CTOR( PolyPolygon, NULL ); const sal_uInt16 nCount(sal_uInt16(rPolyPolygon.count())); - DBG_ASSERT(sal_uInt32(nCount) == rPolyPolygon.count(), + DBG_ASSERT(sal_uInt32(nCount) == rPolyPolygon.count(), "PolyPolygon::PolyPolygon: Too many sub-polygons in given basegfx::B2DPolyPolygon (!)"); if ( nCount ) diff --git a/tools/source/generic/svborder.cxx b/tools/source/generic/svborder.cxx index 62b804faf2c9..eb254faf2310 100644 --- a/tools/source/generic/svborder.cxx +++ b/tools/source/generic/svborder.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,17 +43,17 @@ SvBorder::SvBorder( const Rectangle & rOuter, const Rectangle & rInner ) OSL_ENSURE( aOuter.IsInside( aInner ), "SvBorder::SvBorder: FALSE == aOuter.IsInside( aInner )" ); - nTop = aInner.Top() - aOuter.Top(); - nRight = aOuter.Right() - aInner.Right(); + nTop = aInner.Top() - aOuter.Top(); + nRight = aOuter.Right() - aInner.Right(); nBottom = aOuter.Bottom() - aInner.Bottom(); - nLeft = aInner.Left() - aOuter.Left(); + nLeft = aInner.Left() - aOuter.Left(); } Rectangle & operator += ( Rectangle & rRect, const SvBorder & rBorder ) { // wegen Empty-Rect, GetSize muss als erstes gerufen werden Size aS( rRect.GetSize() ); - aS.Width() += rBorder.Left() + rBorder.Right(); + aS.Width() += rBorder.Left() + rBorder.Right(); aS.Height() += rBorder.Top() + rBorder.Bottom(); rRect.Left() -= rBorder.Left(); @@ -66,7 +66,7 @@ Rectangle & operator -= ( Rectangle & rRect, const SvBorder & rBorder ) { // wegen Empty-Rect, GetSize muss als erstes gerufen werden Size aS( rRect.GetSize() ); - aS.Width() -= rBorder.Left() + rBorder.Right(); + aS.Width() -= rBorder.Left() + rBorder.Right(); aS.Height() -= rBorder.Top() + rBorder.Bottom(); rRect.Left() += rBorder.Left(); diff --git a/tools/source/generic/svlibrary.cxx b/tools/source/generic/svlibrary.cxx index c38c6d63f5ec..6ebfd0086b5c 100644 --- a/tools/source/generic/svlibrary.cxx +++ b/tools/source/generic/svlibrary.cxx @@ -96,7 +96,7 @@ static uno::Sequence< rtl::OUString > GetMultiPaths_Impl() bool SvLibrary::LoadModule( osl::Module& rModule, const rtl::OUString& rLibName, ::oslGenericFunction baseModule, ::sal_Int32 mode )
{
- static uno::Sequence < rtl::OUString > aPaths = GetMultiPaths_Impl();
+ static uno::Sequence < rtl::OUString > aPaths = GetMultiPaths_Impl();
bool bLoaded = false;
for (sal_Int32 n=0; n<aPaths.getLength(); n++)
diff --git a/tools/source/generic/toolsin.cxx b/tools/source/generic/toolsin.cxx index 586b27851c27..50c9c0187b16 100644 --- a/tools/source/generic/toolsin.cxx +++ b/tools/source/generic/toolsin.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,8 +67,8 @@ void InitTools() void DeInitTools() { - TOOLSINDATA** ppData = (TOOLSINDATA**)GetAppData( SHL_TOOLS ); - TOOLSINDATA* pData = *ppData; + TOOLSINDATA** ppData = (TOOLSINDATA**)GetAppData( SHL_TOOLS ); + TOOLSINDATA* pData = *ppData; if ( pData ) { diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx index 39df87f6249f..5324e9be07b8 100644 --- a/tools/source/inet/inetmime.cxx +++ b/tools/source/inet/inetmime.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -799,7 +799,7 @@ const sal_Char * INetMIME::skipQuotedString(const sal_Char * pBegin, || !isWhiteSpace(*p++)) return pBegin; break; - + case '"': return p; @@ -828,7 +828,7 @@ const sal_Unicode * INetMIME::skipQuotedString(const sal_Unicode * pBegin, || !isWhiteSpace(*p++)) return pBegin; break; - + case '"': return p; @@ -1087,7 +1087,7 @@ const sal_Unicode * INetMIME::scanQuotedBlock(const sal_Unicode * pBegin, } else ++pBegin; - } + } break; default: @@ -3347,22 +3347,22 @@ UniString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType, bEncodedWord = bEncodedWord && q != pEnd && *q++ == '='; -// if (bEncodedWord && q != pEnd) -// switch (*q) -// { -// case '\t': -// case ' ': -// case '"': -// case ')': -// case ',': -// case '.': -// case '=': -// break; +// if (bEncodedWord && q != pEnd) +// switch (*q) +// { +// case '\t': +// case ' ': +// case '"': +// case ')': +// case ',': +// case '.': +// case '=': +// break; // -// default: -// bEncodedWord = false; -// break; -// } +// default: +// bEncodedWord = false; +// break; +// } sal_Unicode * pUnicodeBuffer = 0; sal_Size nUnicodeSize = 0; @@ -3464,13 +3464,13 @@ UniString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType, switch (*p++) { -// case '\t': -// case ' ': -// case ',': -// case '.': -// case '=': -// bStartEncodedWord = true; -// break; +// case '\t': +// case ' ': +// case ',': +// case '.': +// case '=': +// bStartEncodedWord = true; +// break; case '"': if (eType != HEADER_FIELD_TEXT && nCommentLevel == 0) diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index 397c4239da18..feec97168b59 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -234,7 +234,7 @@ INetMessageHeaderIterator::~INetMessageHeaderIterator (void) * ImplINetRFC822MessageHeaderData. */ namespace -{ +{ struct ImplINetRFC822MessageHeaderDataImpl { const ByteString* operator()() @@ -262,8 +262,8 @@ namespace } }; - struct ImplINetRFC822MessageHeaderData - : public rtl::StaticAggregate< const ByteString, ImplINetRFC822MessageHeaderDataImpl > {}; + struct ImplINetRFC822MessageHeaderData + : public rtl::StaticAggregate< const ByteString, ImplINetRFC822MessageHeaderDataImpl > {}; } #define HDR(n) ImplINetRFC822MessageHeaderData::get()[(n)] @@ -971,8 +971,8 @@ namespace } }; - struct ImplINetMIMEMessageHeaderData - : public rtl::StaticAggregate< const ByteString, ImplINetMIMEMessageHeaderDataImpl > {}; + struct ImplINetMIMEMessageHeaderData + : public rtl::StaticAggregate< const ByteString, ImplINetMIMEMessageHeaderDataImpl > {}; } #define MIMEHDR(n) ImplINetMIMEMessageHeaderData::get()[(n)] diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx index 76d9a434c53a..ca76d8750bf8 100644 --- a/tools/source/inet/inetstrm.cxx +++ b/tools/source/inet/inetstrm.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/source/memtools/contnr.cxx b/tools/source/memtools/contnr.cxx index 9bbff759e4b9..4a4ee47886ee 100644 --- a/tools/source/memtools/contnr.cxx +++ b/tools/source/memtools/contnr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,11 +51,11 @@ DBG_NAME( Container ) /************************************************************************* |* -|* DbgCheckCBlock() +|* DbgCheckCBlock() |* -|* Beschreibung Pruefung eines CBlock fuer Debug-Utilities -|* Ersterstellung MI 30.01.92 -|* Letzte Aenderung TH 24.01.96 +|* Beschreibung Pruefung eines CBlock fuer Debug-Utilities +|* Ersterstellung MI 30.01.92 +|* Letzte Aenderung TH 24.01.96 |* *************************************************************************/ @@ -76,11 +76,11 @@ const char* CBlock::DbgCheckCBlock( const void* pBlock ) /************************************************************************* |* -|* CBlock::CBlock() +|* CBlock::CBlock() |* -|* Beschreibung Construktor des Verwaltungsblocks -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung Construktor des Verwaltungsblocks +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -88,10 +88,10 @@ CBlock::CBlock( USHORT nInitSize, CBlock* _pPrev, CBlock* _pNext ) { DBG_CTOR( CBlock, DbgCheckCBlock ); - pPrev = _pPrev; - pNext = _pNext; - nSize = nInitSize; - nCount = 0; + pPrev = _pPrev; + pNext = _pNext; + nSize = nInitSize; + nCount = 0; // Datenpuffer anlegen pNodes = new PVOID[nSize]; @@ -99,11 +99,11 @@ CBlock::CBlock( USHORT nInitSize, CBlock* _pPrev, CBlock* _pNext ) /************************************************************************* |* -|* CBlock::CBlock() +|* CBlock::CBlock() |* -|* Beschreibung Construktor des Verwaltungsblocks -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung Construktor des Verwaltungsblocks +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -112,10 +112,10 @@ CBlock::CBlock( USHORT _nSize, CBlock* _pPrev ) DBG_CTOR( CBlock, DbgCheckCBlock ); DBG_ASSERT( _nSize, "CBlock::CBlock(): nSize == 0" ); - pPrev = _pPrev; - pNext = NULL; - nSize = _nSize; - nCount = _nSize; + pPrev = _pPrev; + pNext = NULL; + nSize = _nSize; + nCount = _nSize; // Datenpuffer anlegen und initialisieren pNodes = new PVOID[nSize]; @@ -124,11 +124,11 @@ CBlock::CBlock( USHORT _nSize, CBlock* _pPrev ) /************************************************************************* |* -|* CBlock::CBlock() +|* CBlock::CBlock() |* -|* Beschreibung Copy-Construktor des Verwaltungsblocks -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung Copy-Construktor des Verwaltungsblocks +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -137,10 +137,10 @@ CBlock::CBlock( const CBlock& r, CBlock* _pPrev ) DBG_CTOR( CBlock, DbgCheckCBlock ); DBG_CHKOBJ( &r, CBlock, DbgCheckCBlock ); - pPrev = _pPrev; - pNext = NULL; - nSize = r.nSize; - nCount = r.nCount; + pPrev = _pPrev; + pNext = NULL; + nSize = r.nSize; + nCount = r.nCount; // Datenpuffer anlegen und Daten kopieren pNodes = new PVOID[nSize]; @@ -149,11 +149,11 @@ CBlock::CBlock( const CBlock& r, CBlock* _pPrev ) /************************************************************************* |* -|* CBlock::~CBlock() +|* CBlock::~CBlock() |* -|* Beschreibung Destruktor des Verwaltungsblocks -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung Destruktor des Verwaltungsblocks +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -167,11 +167,11 @@ inline CBlock::~CBlock() /************************************************************************* |* -|* CBlock::Insert() +|* CBlock::Insert() |* -|* Beschreibung Fuegt einen Pointer ein -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung Fuegt einen Pointer ein +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -223,11 +223,11 @@ void CBlock::Insert( void* p, USHORT nIndex, USHORT nReSize ) /************************************************************************* |* -|* CBlock::Split() +|* CBlock::Split() |* -|* Beschreibung Fuegt einen Pointer ein und splittet den Block -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung Fuegt einen Pointer ein und splittet den Block +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -235,8 +235,8 @@ CBlock* CBlock::Split( void* p, USHORT nIndex, USHORT nReSize ) { DBG_CHKTHIS( CBlock, DbgCheckCBlock ); - USHORT nNewSize; - USHORT nMiddle; + USHORT nNewSize; + USHORT nMiddle; CBlock* pNewBlock; nMiddle = nCount/2; @@ -360,11 +360,11 @@ CBlock* CBlock::Split( void* p, USHORT nIndex, USHORT nReSize ) /************************************************************************* |* -|* CBlock::Remove() +|* CBlock::Remove() |* -|* Beschreibung Entfernt einen Pointer -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung Entfernt einen Pointer +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -419,11 +419,11 @@ void* CBlock::Remove( USHORT nIndex, USHORT nReSize ) /************************************************************************* |* -|* CBlock::Replace() +|* CBlock::Replace() |* -|* Beschreibung Ersetzt einen Pointer -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung Ersetzt einen Pointer +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -439,12 +439,12 @@ inline void* CBlock::Replace( void* p, USHORT nIndex ) /************************************************************************* |* -|* CBlock::GetObjectPtr() +|* CBlock::GetObjectPtr() |* -|* Beschreibung Gibt einen Pointer auf den Pointer aus dem Block -|* zurueck -|* Ersterstellung TH 26.01.93 -|* Letzte Aenderung TH 26.01.93 +|* Beschreibung Gibt einen Pointer auf den Pointer aus dem Block +|* zurueck +|* Ersterstellung TH 26.01.93 +|* Letzte Aenderung TH 26.01.93 |* *************************************************************************/ @@ -457,11 +457,11 @@ inline void** CBlock::GetObjectPtr( USHORT nIndex ) /************************************************************************* |* -|* CBlock::SetSize() +|* CBlock::SetSize() |* -|* Beschreibung Aendert die Groesse des Blocks -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung Aendert die Groesse des Blocks +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -499,11 +499,11 @@ void CBlock::SetSize( USHORT nNewSize ) /************************************************************************* |* -|* DbgCheckContainer() +|* DbgCheckContainer() |* -|* Beschreibung Pruefung eines Container fuer Debug-Utilities -|* Ersterstellung MI 30.01.92 -|* Letzte Aenderung TH 24.01.96 +|* Beschreibung Pruefung eines Container fuer Debug-Utilities +|* Ersterstellung MI 30.01.92 +|* Letzte Aenderung TH 24.01.96 |* *************************************************************************/ @@ -521,18 +521,18 @@ const char* Container::DbgCheckContainer( const void* pCont ) /************************************************************************* |* -|* ImpCopyContainer() +|* ImpCopyContainer() |* -|* Beschreibung Kopiert alle Daten des Containers -|* Ersterstellung TH 24.01.96 -|* Letzte Aenderung TH 24.01.96 +|* Beschreibung Kopiert alle Daten des Containers +|* Ersterstellung TH 24.01.96 +|* Letzte Aenderung TH 24.01.96 |* *************************************************************************/ void Container::ImpCopyContainer( const Container* pCont2 ) { // Werte vom uebergebenen Container uebernehmen - nCount = pCont2->nCount; + nCount = pCont2->nCount; nCurIndex = pCont2->nCurIndex; nInitSize = pCont2->nInitSize; nReSize = pCont2->nReSize; @@ -574,18 +574,18 @@ void Container::ImpCopyContainer( const Container* pCont2 ) else { pFirstBlock = NULL; - pLastBlock = NULL; - pCurBlock = NULL; + pLastBlock = NULL; + pCurBlock = NULL; } } /************************************************************************* |* -|* Container::Container() +|* Container::Container() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -638,19 +638,19 @@ Container::Container( USHORT _nBlockSize, USHORT _nInitSize, USHORT _nReSize ) // Werte initialisieren pFirstBlock = NULL; - pLastBlock = NULL; - pCurBlock = NULL; - nCount = 0; - nCurIndex = 0; + pLastBlock = NULL; + pCurBlock = NULL; + nCount = 0; + nCurIndex = 0; } /************************************************************************* |* -|* Container::Container() +|* Container::Container() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -658,7 +658,7 @@ Container::Container( ULONG nSize ) { DBG_CTOR( Container, DbgCheckContainer ); - nCount = nSize; + nCount = nSize; nCurIndex = 0; nBlockSize = CONTAINER_MAXBLOCKSIZE; nInitSize = 1; @@ -667,8 +667,8 @@ Container::Container( ULONG nSize ) if ( !nSize ) { pFirstBlock = NULL; - pLastBlock = NULL; - pCurBlock = NULL; + pLastBlock = NULL; + pCurBlock = NULL; } else { @@ -706,11 +706,11 @@ Container::Container( ULONG nSize ) /************************************************************************* |* -|* Container::Container() +|* Container::Container() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -724,11 +724,11 @@ Container::Container( const Container& r ) /************************************************************************* |* -|* Container::~Container() +|* Container::~Container() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -748,11 +748,11 @@ Container::~Container() /************************************************************************* |* -|* Container::ImpInsert() +|* Container::ImpInsert() |* -|* Beschreibung Interne Methode zum Einfuegen eines Pointers -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung DV 01.07.97 +|* Beschreibung Interne Methode zum Einfuegen eines Pointers +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung DV 01.07.97 |* *************************************************************************/ @@ -765,8 +765,8 @@ void Container::ImpInsert( void* p, CBlock* pBlock, USHORT nIndex ) if ( !pBlock ) { pFirstBlock = new CBlock( nInitSize, NULL, NULL ); - pLastBlock = pFirstBlock; - pCurBlock = pFirstBlock; + pLastBlock = pFirstBlock; + pCurBlock = pFirstBlock; } pFirstBlock->Insert( p, nIndex, nReSize ); } @@ -833,11 +833,11 @@ void Container::ImpInsert( void* p, CBlock* pBlock, USHORT nIndex ) /************************************************************************* |* -|* Container::Insert() +|* Container::Insert() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -848,11 +848,11 @@ void Container::Insert( void* p ) /************************************************************************* |* -|* Container::Insert() +|* Container::Insert() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -872,7 +872,7 @@ void Container::Insert( void* p, ULONG nIndex ) while ( pTemp->Count() < nIndex ) { nIndex -= pTemp->Count(); - pTemp = pTemp->GetNextBlock(); + pTemp = pTemp->GetNextBlock(); } ImpInsert( p, pTemp, (USHORT)nIndex ); @@ -881,11 +881,11 @@ void Container::Insert( void* p, ULONG nIndex ) /************************************************************************* |* -|* Container::Insert() +|* Container::Insert() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -898,11 +898,11 @@ void Container::Insert( void* pNew, void* pOld ) /************************************************************************* |* -|* Container::ImpRemove() +|* Container::ImpRemove() |* -|* Beschreibung Interne Methode zum Entfernen eines Pointers -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung Interne Methode zum Entfernen eines Pointers +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -975,11 +975,11 @@ void* Container::ImpRemove( CBlock* pBlock, USHORT nIndex ) /************************************************************************* |* -|* Container::Remove() +|* Container::Remove() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -994,11 +994,11 @@ void* Container::Remove() /************************************************************************* |* -|* Container::Remove() +|* Container::Remove() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -1014,7 +1014,7 @@ void* Container::Remove( ULONG nIndex ) while ( pTemp->Count() <= nIndex ) { nIndex -= pTemp->Count(); - pTemp = pTemp->GetNextBlock(); + pTemp = pTemp->GetNextBlock(); } return ImpRemove( pTemp, (USHORT)nIndex ); @@ -1023,11 +1023,11 @@ void* Container::Remove( ULONG nIndex ) /************************************************************************* |* -|* Container::Replace() +|* Container::Replace() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -1043,11 +1043,11 @@ void* Container::Replace( void* p ) /************************************************************************* |* -|* Container::Replace() +|* Container::Replace() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -1065,7 +1065,7 @@ void* Container::Replace( void* p, ULONG nIndex ) while ( pTemp->Count() <= nIndex ) { nIndex -= pTemp->Count(); - pTemp = pTemp->GetNextBlock(); + pTemp = pTemp->GetNextBlock(); } return pTemp->Replace( p, (USHORT)nIndex ); @@ -1074,11 +1074,11 @@ void* Container::Replace( void* p, ULONG nIndex ) /************************************************************************* |* -|* Container::SetSize() +|* Container::SetSize() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -1092,7 +1092,7 @@ void Container::SetSize( ULONG nNewSize ) if ( nNewSize != nCount ) { CBlock* pTemp; - ULONG nTemp; + ULONG nTemp; // Wird verkleinert if ( nNewSize < nCount ) @@ -1106,7 +1106,7 @@ void Container::SetSize( ULONG nNewSize ) } // Alle folgenden Bloecke loeschen - BOOL bLast = FALSE; + BOOL bLast = FALSE; CBlock* pDelNext; CBlock* pDelBlock = pTemp->GetNextBlock(); while ( pDelBlock ) @@ -1218,11 +1218,11 @@ void Container::SetSize( ULONG nNewSize ) /************************************************************************* |* -|* Container::Clear() +|* Container::Clear() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -1241,19 +1241,19 @@ void Container::Clear() // Werte zuruecksetzen pFirstBlock = NULL; - pLastBlock = NULL; - pCurBlock = NULL; - nCount = 0; - nCurIndex = 0; + pLastBlock = NULL; + pCurBlock = NULL; + nCount = 0; + nCurIndex = 0; } /************************************************************************* |* -|* Container::GetCurObject() +|* Container::GetCurObject() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -1270,11 +1270,11 @@ void* Container::GetCurObject() const /************************************************************************* |* -|* Container::GetCurPos() +|* Container::GetCurPos() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -1289,7 +1289,7 @@ ULONG Container::GetCurPos() const { // Block suchen CBlock* pTemp = pFirstBlock; - ULONG nTemp = 0; + ULONG nTemp = 0; while ( pTemp != pCurBlock ) { nTemp += pTemp->Count(); @@ -1302,11 +1302,11 @@ ULONG Container::GetCurPos() const /************************************************************************* |* -|* Container::GetObjectPtr() +|* Container::GetObjectPtr() |* -|* Beschreibung Interne Methode fuer Referenz-Container -|* Ersterstellung TH 26.01.93 -|* Letzte Aenderung TH 26.01.93 +|* Beschreibung Interne Methode fuer Referenz-Container +|* Ersterstellung TH 26.01.93 +|* Letzte Aenderung TH 26.01.93 |* *************************************************************************/ @@ -1324,7 +1324,7 @@ void** Container::GetObjectPtr( ULONG nIndex ) while ( pTemp->Count() <= nIndex ) { nIndex -= pTemp->Count(); - pTemp = pTemp->GetNextBlock(); + pTemp = pTemp->GetNextBlock(); } // Item innerhalb des gefundenen Blocks zurueckgeben @@ -1334,11 +1334,11 @@ void** Container::GetObjectPtr( ULONG nIndex ) /************************************************************************* |* -|* Container::GetObject() +|* Container::GetObject() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -1356,7 +1356,7 @@ void* Container::GetObject( ULONG nIndex ) const while ( pTemp->Count() <= nIndex ) { nIndex -= pTemp->Count(); - pTemp = pTemp->GetNextBlock(); + pTemp = pTemp->GetNextBlock(); } // Item innerhalb des gefundenen Blocks zurueckgeben @@ -1366,11 +1366,11 @@ void* Container::GetObject( ULONG nIndex ) const /************************************************************************* |* -|* Container::GetPos() +|* Container::GetPos() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -1378,11 +1378,11 @@ ULONG Container::GetPos( const void* p ) const { DBG_CHKTHIS( Container, DbgCheckContainer ); - void** pNodes; + void** pNodes; CBlock* pTemp; - ULONG nTemp; - USHORT nBlockCount; - USHORT i; + ULONG nTemp; + USHORT nBlockCount; + USHORT i; // Block suchen pTemp = pFirstBlock; @@ -1408,11 +1408,11 @@ ULONG Container::GetPos( const void* p ) const /************************************************************************* |* -|* Container::GetPos() +|* Container::GetPos() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 14.09.94 -|* Letzte Aenderung TH 14.09.94 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 14.09.94 +|* Letzte Aenderung TH 14.09.94 |* *************************************************************************/ @@ -1426,13 +1426,13 @@ ULONG Container::GetPos( const void* p, ULONG nStartIndex, return CONTAINER_ENTRY_NOTFOUND; else { - void** pNodes; - USHORT nBlockCount; - USHORT i; + void** pNodes; + USHORT nBlockCount; + USHORT i; // Block suchen CBlock* pTemp = pFirstBlock; - ULONG nTemp = 0; + ULONG nTemp = 0; while ( nTemp+pTemp->Count() <= nStartIndex ) { nTemp += pTemp->Count(); @@ -1503,11 +1503,11 @@ ULONG Container::GetPos( const void* p, ULONG nStartIndex, /************************************************************************* |* -|* Container::Seek() +|* Container::Seek() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -1525,7 +1525,7 @@ void* Container::Seek( ULONG nIndex ) while ( pTemp->Count() <= nIndex ) { nIndex -= pTemp->Count(); - pTemp = pTemp->GetNextBlock(); + pTemp = pTemp->GetNextBlock(); } // Item innerhalb des gefundenen Blocks zurueckgeben @@ -1537,11 +1537,11 @@ void* Container::Seek( ULONG nIndex ) /************************************************************************* |* -|* Container::First() +|* Container::First() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -1563,11 +1563,11 @@ void* Container::First() /************************************************************************* |* -|* Container::Last() +|* Container::Last() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -1589,11 +1589,11 @@ void* Container::Last() /************************************************************************* |* -|* Container::Next() +|* Container::Next() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -1621,11 +1621,11 @@ void* Container::Next() /************************************************************************* |* -|* Container::Prev() +|* Container::Prev() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -1653,11 +1653,11 @@ void* Container::Prev() /************************************************************************* |* -|* Container::operator =() +|* Container::operator =() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ @@ -1681,11 +1681,11 @@ Container& Container::operator =( const Container& r ) /************************************************************************* |* -|* Container::operator ==() +|* Container::operator ==() |* -|* Beschreibung CONTNR.SDW -|* Ersterstellung TH 17.09.91 -|* Letzte Aenderung TH 17.09.91 +|* Beschreibung CONTNR.SDW +|* Ersterstellung TH 17.09.91 +|* Letzte Aenderung TH 17.09.91 |* *************************************************************************/ diff --git a/tools/source/memtools/mempool.cxx b/tools/source/memtools/mempool.cxx index 1ce4680fc096..45d6d2ea9367 100644 --- a/tools/source/memtools/mempool.cxx +++ b/tools/source/memtools/mempool.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/source/memtools/multisel.cxx b/tools/source/memtools/multisel.cxx index beca496b11a3..1e4da74348f4 100644 --- a/tools/source/memtools/multisel.cxx +++ b/tools/source/memtools/multisel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -147,12 +147,12 @@ MultiSelection::MultiSelection( const UniString& rString, sal_Unicode cRange, sa // an die verschiedenen Systeme (UNIX etc.) // und die gewuenschte Eingabe-Syntax angepasst werden. - UniString aStr( rString ); - sal_Unicode* pStr = aStr.GetBufferAccess(); - sal_Unicode* pOld = pStr; - BOOL bReady = FALSE; - BOOL bUntil = FALSE; - xub_StrLen nCut = 0; + UniString aStr( rString ); + sal_Unicode* pStr = aStr.GetBufferAccess(); + sal_Unicode* pOld = pStr; + BOOL bReady = FALSE; + BOOL bUntil = FALSE; + xub_StrLen nCut = 0; // Hier normieren wir den String, sodass nur Ziffern, // Semikola als Trenn- und Minus als VonBis-Zeichen @@ -228,11 +228,11 @@ MultiSelection::MultiSelection( const UniString& rString, sal_Unicode cRange, sa aStr.ReleaseBufferAccess( nCut ); // Jetzt wird der normierte String ausgewertet .. - UniString aNumStr; - Range aRg( 1, RANGE_MAX ); - const sal_Unicode* pCStr = aStr.GetBuffer(); - long nPage = 1; - long nNum = 1; + UniString aNumStr; + Range aRg( 1, RANGE_MAX ); + const sal_Unicode* pCStr = aStr.GetBuffer(); + long nPage = 1; + long nNum = 1; bUntil = FALSE; while ( *pCStr ) { @@ -880,7 +880,7 @@ StringRangeEnumerator::StringRangeEnumerator( const rtl::OUString& i_rInput, : mnCount( 0 ) , mnMin( i_nMinNumber ) , mnMax( i_nMaxNumber ) - , mnOffset( i_nLogicalOffset ) + , mnOffset( i_nLogicalOffset ) { setRange( i_rInput ); } @@ -951,7 +951,7 @@ bool StringRangeEnumerator::insertRange( sal_Int32 i_nFirst, sal_Int32 i_nLast, bSuccess = false; } } - + return bSuccess; } @@ -969,7 +969,7 @@ bool StringRangeEnumerator::setRange( const rtl::OUString& i_rNewRange, bool i_b } return true; } - + const sal_Unicode* pInput = i_rNewRange.getStr(); rtl::OUStringBuffer aNumberBuf( 16 ); sal_Int32 nLastNumber = -1, nNumber = -1; @@ -1018,11 +1018,11 @@ bool StringRangeEnumerator::setRange( const rtl::OUString& i_rNewRange, bool i_b bInsertRange = true; else if( *pInput ) { - + bSuccess = false; break; // parse error } - + if( bInsertRange ) { if( ! insertRange( nLastNumber, nNumber, bSequence, ! i_bStrict ) && i_bStrict ) @@ -1038,7 +1038,7 @@ bool StringRangeEnumerator::setRange( const rtl::OUString& i_rNewRange, bool i_b } // insert last entries insertRange( nLastNumber, nNumber, bSequence, ! i_bStrict ); - + return bSuccess; } diff --git a/tools/source/memtools/table.cxx b/tools/source/memtools/table.cxx index ae5bcfbd3e16..50ac46e99758 100644 --- a/tools/source/memtools/table.cxx +++ b/tools/source/memtools/table.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,11 +43,11 @@ ULONG Table::ImplGetIndex( ULONG nKey, ULONG* pIndex ) const if ( !nCount || (nKey < (ULONG)Container::ImpGetObject(0)) ) return TABLE_ENTRY_NOTFOUND; - ULONG nLow; - ULONG nHigh; - ULONG nMid; - ULONG nCompareKey; - void** pNodes = Container::ImpGetOnlyNodes(); + ULONG nLow; + ULONG nHigh; + ULONG nMid; + ULONG nCompareKey; + void** pNodes = Container::ImpGetOnlyNodes(); // Binaeres Suchen nLow = 0; @@ -122,7 +122,7 @@ BOOL Table::Insert( ULONG nKey, void* p ) { USHORT n = 0; USHORT nTempCount = (USHORT)nCount * 2; - //<!--Modified by PengYunQuan for resolving a NULL pointer access + //<!--Modified by PengYunQuan for resolving a NULL pointer access if( void** pNodes = Container::ImpGetOnlyNodes() ) { @@ -152,7 +152,7 @@ BOOL Table::Insert( ULONG nKey, void* p ) if ( ImplGetIndex( nKey, &i ) != TABLE_ENTRY_NOTFOUND ) return FALSE; } - //-->Modified by PengYunQuan for resolving a NULL pointer access + //-->Modified by PengYunQuan for resolving a NULL pointer access } else { diff --git a/tools/source/memtools/unqidx.cxx b/tools/source/memtools/unqidx.cxx index 985dbae1783c..94624c3ac905 100644 --- a/tools/source/memtools/unqidx.cxx +++ b/tools/source/memtools/unqidx.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,10 +45,10 @@ UniqueIndex::UniqueIndex( ULONG _nStartIndex, ULONG _nInitSize, ULONG _nReSize ) : Container( _nInitSize ) { - nReSize = _nReSize; - nStartIndex = _nStartIndex; - nUniqIndex = 0; - nCount = 0; + nReSize = _nReSize; + nStartIndex = _nStartIndex; + nUniqIndex = 0; + nCount = 0; } /************************************************************************* diff --git a/tools/source/misc/appendunixshellword.cxx b/tools/source/misc/appendunixshellword.cxx index 6d65438542c7..af2a05b00716 100644 --- a/tools/source/misc/appendunixshellword.cxx +++ b/tools/source/misc/appendunixshellword.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/source/misc/extendapplicationenvironment.cxx b/tools/source/misc/extendapplicationenvironment.cxx index 80ed43fac29a..fe76e5329cbb 100644 --- a/tools/source/misc/extendapplicationenvironment.cxx +++ b/tools/source/misc/extendapplicationenvironment.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/source/misc/getprocessworkingdir.cxx b/tools/source/misc/getprocessworkingdir.cxx index 60d7e24bdd30..8cad594befca 100644 --- a/tools/source/misc/getprocessworkingdir.cxx +++ b/tools/source/misc/getprocessworkingdir.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/source/misc/pathutils.cxx b/tools/source/misc/pathutils.cxx index ba4c78fa9f3a..397bade136e7 100644 --- a/tools/source/misc/pathutils.cxx +++ b/tools/source/misc/pathutils.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/source/misc/solarmutex.cxx b/tools/source/misc/solarmutex.cxx index 95f37bef6fba..5abdfef5e37f 100644 --- a/tools/source/misc/solarmutex.cxx +++ b/tools/source/misc/solarmutex.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/source/rc/isofallback.cxx b/tools/source/rc/isofallback.cxx index d59e4175b46d..002a90f580aa 100644 --- a/tools/source/rc/isofallback.cxx +++ b/tools/source/rc/isofallback.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/source/rc/rc.cxx b/tools/source/rc/rc.cxx index 567588c51713..e24b8f8824d4 100644 --- a/tools/source/rc/rc.cxx +++ b/tools/source/rc/rc.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/source/rc/resary.cxx b/tools/source/rc/resary.cxx index eda5de6c40b3..a55a4f644a9f 100644 --- a/tools/source/rc/resary.cxx +++ b/tools/source/rc/resary.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ ResStringArray::ResStringArray( const ResId& rResId ) { // load string m_aStrings.push_back( ImplResStringItem( pMgr->ReadString() ) ); - + // load value m_aStrings[i].m_nValue = pMgr->ReadLong(); } diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 6349298aefdc..daeaf8e4c3a5 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,13 +93,13 @@ class InternalResMgr friend class SimpleResMgr; friend class ResMgrContainer; - ImpContent * pContent; - UINT32 nOffCorrection; - BYTE * pStringBlock; - SvStream * pStm; - BOOL bEqual2Content; - UINT32 nEntries; - OUString aFileName; + ImpContent * pContent; + UINT32 nOffCorrection; + BYTE * pStringBlock; + SvStream * pStm; + BOOL bEqual2Content; + UINT32 nEntries; + OUString aFileName; OUString aPrefix; OUString aResName; bool bSingular; @@ -111,15 +111,15 @@ class InternalResMgr const OUString& aResName, const com::sun::star::lang::Locale& rLocale ); ~InternalResMgr(); - BOOL Create(); + BOOL Create(); - BOOL IsGlobalAvailable( RESOURCE_TYPE nRT, sal_uInt32 nId ) const; - void * LoadGlobalRes( RESOURCE_TYPE nRT, sal_uInt32 nId, + BOOL IsGlobalAvailable( RESOURCE_TYPE nRT, sal_uInt32 nId ) const; + void * LoadGlobalRes( RESOURCE_TYPE nRT, sal_uInt32 nId, void **pResHandle ); public: - void FreeGlobalRes( void *, void * ); + void FreeGlobalRes( void *, void * ); - SvStream * GetBitmapStream( sal_uInt32 nResId ); + SvStream * GetBitmapStream( sal_uInt32 nResId ); }; // ======================================================================= @@ -127,39 +127,39 @@ public: class ResMgrContainer { static ResMgrContainer* pOneInstance; - + struct ContainerElement { InternalResMgr* pResMgr; OUString aFileURL; int nRefCount; int nLoadCount; - + ContainerElement() : pResMgr( NULL ), nRefCount( 0 ), nLoadCount( 0 ) {} }; - + std::hash_map< OUString, ContainerElement, OUStringHash> m_aResFiles; com::sun::star::lang::Locale m_aDefLocale; - + ResMgrContainer() { init(); } ~ResMgrContainer(); - + void init(); public: - static ResMgrContainer& get(); + static ResMgrContainer& get(); static void release(); - + InternalResMgr* getResMgr( const OUString& rPrefix, com::sun::star::lang::Locale& rLocale, bool bForceNewInstance = false ); InternalResMgr* getNextFallback( InternalResMgr* pResMgr ); - + void freeResMgr( InternalResMgr* pResMgr ); void setDefLocale( const com::sun::star::lang::Locale& rLocale ) @@ -200,7 +200,7 @@ void ResMgrContainer::init() // get resource path std::list< OUString > aDirs; sal_Int32 nIndex = 0; - + // 1. fixed locations rtl::OUString uri( RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/resource")); @@ -210,7 +210,7 @@ void ResMgrContainer::init() RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/program/resource")); rtl::Bootstrap::expandMacros(uri); aDirs.push_back(uri); - + // 2. in STAR_RESOURCEPATH const sal_Char* pEnv = getenv( "STAR_RESOURCEPATH" ); if( pEnv ) @@ -286,7 +286,7 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix, com::sun::star::lang::Locale aLocale( rLocale ); OUStringBuffer aSearch( rPrefix.getLength() + 16 ); std::hash_map< OUString, ContainerElement, OUStringHash >::iterator it = m_aResFiles.end(); - + int nTries = 0; if( aLocale.Language.getLength() > 0 ) nTries = 1; @@ -405,10 +405,10 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix, // at this point it->second.pResMgr must be filled either by creating a new one // (then the refcount is still 0) or because we already had one InternalResMgr* pImp = it->second.pResMgr; - + if( it->second.nRefCount == 0 ) it->second.nLoadCount++; - + // for SimpleResMgr if( bForceNewInstance ) { @@ -434,7 +434,7 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix, } else it->second.nRefCount++; - + return pImp; } @@ -499,7 +499,7 @@ struct ImpContent struct ImpContentLessCompare : public ::std::binary_function< ImpContent, ImpContent, bool> { - inline bool operator() (const ImpContent& lhs, const ImpContent& rhs) const + inline bool operator() (const ImpContent& lhs, const ImpContent& rhs) const { return lhs.nTypeAndId < rhs.nTypeAndId; } @@ -507,11 +507,11 @@ struct ImpContentLessCompare : public ::std::binary_function< ImpContent, ImpCon struct ImpContentMixLessCompare : public ::std::binary_function< ImpContent, sal_uInt64, bool> { - inline bool operator() (const ImpContent& lhs, const sal_uInt64& rhs) const + inline bool operator() (const ImpContent& lhs, const sal_uInt64& rhs) const { return lhs.nTypeAndId < rhs; } - inline bool operator() (const sal_uInt64& lhs, const ImpContent& rhs) const + inline bool operator() (const sal_uInt64& lhs, const ImpContent& rhs) const { return lhs < rhs.nTypeAndId; } @@ -664,7 +664,7 @@ BOOL InternalResMgr::Create() OSL_ENSURE( bEqual2Content, "resource structure wrong" ); if( !bSorted ) ::std::sort(pContent,pContent+nEntries,ImpContentLessCompare()); - // qsort( pContent, nEntries, sizeof( ImpContent ), Compare ); + // qsort( pContent, nEntries, sizeof( ImpContent ), Compare ); bDone = TRUE; } @@ -697,7 +697,7 @@ void* InternalResMgr::LoadGlobalRes( RESOURCE_TYPE nRT, sal_uInt32 nId, // Anfang der Strings suchen sal_uInt64 nValue = ((sal_uInt64(nRT) << 32) | nId); ImpContent* pEnd = (pContent + nEntries); - ImpContent* pFind = ::std::lower_bound( pContent, + ImpContent* pFind = ::std::lower_bound( pContent, pEnd, nValue, ImpContentMixLessCompare()); @@ -801,7 +801,7 @@ void ResMgr::RscError_Impl( const sal_Char* pMessage, ResMgr* pResMgr, ResMgrContainer::get().getResMgr( pResMgr->pImpRes->aPrefix, pResMgr->pImpRes->aLocale, true ); - + ResMgr* pNewResMgr = new ResMgr( pImp ); ByteString aStr = OUStringToOString( pResMgr->GetFileName(), RTL_TEXTENCODING_UTF8 ); @@ -990,7 +990,7 @@ ResMgr::~ResMgr() osl::Guard<osl::Mutex> aGuard( getResMgrMutex() ); ResMgrContainer::get().freeResMgr( pImpRes ); - + // clean up possible left rc stack frames while( nCurStack > 0 ) { @@ -1008,7 +1008,7 @@ void ResMgr::incStack() if( nCurStack >= int(aStack.size()) ) aStack.push_back( ImpRCStack() ); aStack[nCurStack].Clear(); - + DBG_ASSERT( nCurStack < 32, "Resource stack unreasonably large" ); } @@ -1028,7 +1028,7 @@ void ResMgr::decStack() { #if OSL_DEBUG_LEVEL > 1 OSL_TRACE( "returning from fallback %s\n", - OUStringToOString(pFallbackResMgr->GetFileName(), osl_getThreadTextEncoding() ).getStr() ); + OUStringToOString(pFallbackResMgr->GetFileName(), osl_getThreadTextEncoding() ).getStr() ); #endif delete pFallbackResMgr; pFallbackResMgr = NULL; @@ -1081,14 +1081,14 @@ BOOL ResMgr::IsAvailable( const ResId& rId, const Resource* pResObj ) const if ( !pMgr ) pMgr = this; - + if( pMgr->pFallbackResMgr ) { ResId aId( rId ); aId.SetResMgr( NULL ); return pMgr->pFallbackResMgr->IsAvailable( aId, pResObj ); } - + if ( !pResObj || pResObj == pMgr->aStack[pMgr->nCurStack].pResObj ) { if ( !pClassRes ) @@ -1115,7 +1115,7 @@ void* ResMgr::GetClass() if( pFallbackResMgr ) return pFallbackResMgr->GetClass(); - + return aStack[nCurStack].pClassRes; } @@ -1135,7 +1135,7 @@ BOOL ResMgr::GetResource( const ResId& rId, const Resource* pResObj ) ResMgr* pMgr = rId.GetResMgr(); if ( pMgr && (this != pMgr) ) return pMgr->GetResource( rId, pResObj ); - + // normally Increment will pop the context; this is // not possible in RC_NOTFOUND case, so pop a frame here ImpRCStack* pTop = &aStack[nCurStack]; @@ -1248,7 +1248,7 @@ void ResMgr::PopContext( const Resource* pResObj ) pFallbackResMgr->PopContext( pResObj ); return; } - + #ifdef DBG_UTIL if ( DbgIsResource() ) { @@ -1299,7 +1299,7 @@ RSHEADER_TYPE* ResMgr::CreateBlock( const ResId& rId ) aId.SetResMgr( NULL ); return pFallbackResMgr->CreateBlock( aId ); } - + RSHEADER_TYPE* pHeader = NULL; if ( GetResource( rId ) ) { @@ -1385,7 +1385,7 @@ sal_uInt32 ResMgr::GetRemainSize() if( pFallbackResMgr ) return pFallbackResMgr->GetRemainSize(); - + const ImpRCStack& rTop = aStack[nCurStack]; return (sal_uInt32)((long)(BYTE *)rTop.pResource + rTop.pResource->GetLocalOff() - @@ -1400,11 +1400,11 @@ void* ResMgr::Increment( sal_uInt32 nSize ) if( pFallbackResMgr ) return pFallbackResMgr->Increment( nSize ); - + ImpRCStack& rStack = aStack[nCurStack]; if( (rStack.Flags & RC_NOTFOUND) ) return rStack.pClassRes; - + BYTE* pClassRes = (BYTE*)rStack.pClassRes + nSize; rStack.pClassRes = pClassRes; @@ -1680,9 +1680,9 @@ ResMgr* ResMgr::CreateResMgr( const sal_Char* pPrefixName, osl::Guard<osl::Mutex> aGuard( getResMgrMutex() ); OUString aPrefix( pPrefixName, strlen( pPrefixName ), osl_getThreadTextEncoding() ); - + if( ! aLocale.Language.getLength() ) - aLocale = ResMgrContainer::get().getDefLocale(); + aLocale = ResMgrContainer::get().getDefLocale(); InternalResMgr* pImp = ResMgrContainer::get().getResMgr( aPrefix, aLocale ); return pImp ? new ResMgr( pImp ) : NULL; @@ -1700,7 +1700,7 @@ ResMgr* ResMgr::SearchCreateResMgr( if( ! rLocale.Language.getLength() ) rLocale = ResMgrContainer::get().getDefLocale(); - + InternalResMgr* pImp = ResMgrContainer::get().getResMgr( aPrefix, rLocale ); return pImp ? new ResMgr( pImp ) : NULL; } @@ -1713,7 +1713,7 @@ INT16 ResMgr::ReadShort() if( pFallbackResMgr ) return pFallbackResMgr->ReadShort(); - + INT16 n = GetShort( GetClass() ); Increment( sizeof( INT16 ) ); return n; @@ -1727,7 +1727,7 @@ INT32 ResMgr::ReadLong() if( pFallbackResMgr ) return pFallbackResMgr->ReadLong(); - + INT32 n = GetLong( GetClass() ); Increment( sizeof( INT32 ) ); return n; @@ -1741,7 +1741,7 @@ UniString ResMgr::ReadStringWithoutHook() if( pFallbackResMgr ) return pFallbackResMgr->ReadStringWithoutHook(); - + UniString aRet; const ImpRCStack& rTop = aStack[nCurStack]; @@ -1753,7 +1753,7 @@ UniString ResMgr::ReadStringWithoutHook() } else Increment( GetStringWithoutHook( aRet, (const BYTE*)GetClass() ) ); - + return aRet; } @@ -1773,7 +1773,7 @@ ULONG ResMgr::GetAutoHelpId() if( pFallbackResMgr ) return pFallbackResMgr->GetAutoHelpId(); - + DBG_ASSERT( nCurStack, "resource stack empty in Auto help id generation" ); if( nCurStack < 1 || nCurStack > 2 ) return 0; @@ -1785,7 +1785,7 @@ ULONG ResMgr::GetAutoHelpId() if( !nGID || nGID > 32767 ) return 0; - + ULONG nHID = 0; // GGGg gggg::gggg gggg::ggLL LLLl::llll llll @@ -1847,7 +1847,7 @@ ULONG ResMgr::GetAutoHelpId() return 0; } // of switch nHID |= nGID << 14; - + return nHID; } @@ -1891,9 +1891,9 @@ SimpleResMgr::SimpleResMgr( const sal_Char* pPrefixName, osl::Guard<osl::Mutex> aGuard( getResMgrMutex() ); if( ! aLocale.Language.getLength() ) - aLocale = ResMgrContainer::get().getDefLocale(); - - m_pResImpl = ResMgrContainer::get().getResMgr( aPrefix, aLocale, true ); + aLocale = ResMgrContainer::get().getDefLocale(); + + m_pResImpl = ResMgrContainer::get().getResMgr( aPrefix, aLocale, true ); DBG_ASSERT( m_pResImpl, "SimpleResMgr::SimpleResMgr : have no impl class !" ); } @@ -1901,7 +1901,7 @@ SimpleResMgr::SimpleResMgr( const sal_Char* pPrefixName, SimpleResMgr::SimpleResMgr( const ::rtl::OUString& _rPrefixName, ::com::sun::star::lang::Locale& _inout_Locale ) { osl::Guard<osl::Mutex> aGuard( getResMgrMutex() ); - m_pResImpl = ResMgrContainer::get().getResMgr( _rPrefixName, _inout_Locale, true ); + m_pResImpl = ResMgrContainer::get().getResMgr( _rPrefixName, _inout_Locale, true ); } // ----------------------------------------------------------------------- diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx index fc70fd09d9ef..2f9c75a4b71c 100644 --- a/tools/source/ref/errinf.cxx +++ b/tools/source/ref/errinf.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -370,7 +370,7 @@ USHORT ErrorHandler::HandleError_Impl( // Error 1 ist General Error im Sfx if(pInfo->GetErrorCode()!=1) { HandleError_Impl(1, USHRT_MAX, bJustCreateString, rError); - } + } else { DBG_ERROR("Error 1 nicht gehandeled"); } diff --git a/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx index e341ccf7ceb3..2d45e470e688 100644 --- a/tools/source/ref/globname.cxx +++ b/tools/source/ref/globname.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ ImpSvGlobalName::ImpSvGlobalName( int ) } /************************************************************************* -|* ImpSvGlobalName::operator ==() +|* ImpSvGlobalName::operator ==() *************************************************************************/ BOOL ImpSvGlobalName::operator == ( const ImpSvGlobalName & rObj ) const { @@ -58,7 +58,7 @@ BOOL ImpSvGlobalName::operator == ( const ImpSvGlobalName & rObj ) const } /************************************************************************* -|* SvGlobalName::SvGlobalName() +|* SvGlobalName::SvGlobalName() *************************************************************************/ SvGlobalName::SvGlobalName() { @@ -94,7 +94,7 @@ SvGlobalName::SvGlobalName( UINT32 n1, USHORT n2, USHORT n3, pImp = new ImpSvGlobalName(); pImp->nRefCount++; - *(UINT32 *)pImp->szData = n1; + *(UINT32 *)pImp->szData = n1; *(USHORT *)&pImp->szData[ 4 ] = n2; *(USHORT *)&pImp->szData[ 6 ] = n3; pImp->szData[ 8 ] = b8; @@ -108,7 +108,7 @@ SvGlobalName::SvGlobalName( UINT32 n1, USHORT n2, USHORT n3, } /************************************************************************* -|* SvGlobalName::~SvGlobalName() +|* SvGlobalName::~SvGlobalName() *************************************************************************/ SvGlobalName::~SvGlobalName() { @@ -118,7 +118,7 @@ SvGlobalName::~SvGlobalName() } /************************************************************************* -|* SvGlobalName::operator = () +|* SvGlobalName::operator = () *************************************************************************/ SvGlobalName & SvGlobalName::operator = ( const SvGlobalName & rObj ) { @@ -131,7 +131,7 @@ SvGlobalName & SvGlobalName::operator = ( const SvGlobalName & rObj ) } /************************************************************************* -|* SvGlobalName::NewImp() +|* SvGlobalName::NewImp() *************************************************************************/ void SvGlobalName::NewImp() { @@ -144,8 +144,8 @@ void SvGlobalName::NewImp() } /************************************************************************* -|* SvGlobalName::operator << () -|* SvGlobalName::operator >> () +|* SvGlobalName::operator << () +|* SvGlobalName::operator >> () *************************************************************************/ SvStream& operator << ( SvStream& rOStr, const SvGlobalName & rObj ) { @@ -168,7 +168,7 @@ SvStream& operator >> ( SvStream& rStr, SvGlobalName & rObj ) /************************************************************************* -|* SvGlobalName::operator < () +|* SvGlobalName::operator < () *************************************************************************/ BOOL SvGlobalName::operator < ( const SvGlobalName & rObj ) const { @@ -181,14 +181,14 @@ BOOL SvGlobalName::operator < ( const SvGlobalName & rObj ) const else if( *(USHORT *)&pImp->szData[ 4 ] < *(USHORT *)&rObj.pImp->szData[ 4 ] ) return TRUE; else if( *(USHORT *)&pImp->szData[ 4 ] == *(USHORT *)&rObj.pImp->szData[ 4 ] ) - return *(UINT32 *)pImp->szData < *(UINT32 *)rObj.pImp->szData; + return *(UINT32 *)pImp->szData < *(UINT32 *)rObj.pImp->szData; else return FALSE; } /************************************************************************* -|* SvGlobalName::operator +=() +|* SvGlobalName::operator +=() *************************************************************************/ SvGlobalName & SvGlobalName::operator += ( UINT32 n ) { @@ -202,7 +202,7 @@ SvGlobalName & SvGlobalName::operator += ( UINT32 n ) } /************************************************************************* -|* SvGlobalName::operator ==() +|* SvGlobalName::operator ==() *************************************************************************/ BOOL SvGlobalName::operator == ( const SvGlobalName & rObj ) const { @@ -216,11 +216,11 @@ void SvGlobalName::MakeFromMemory( void * pData ) } /************************************************************************* -|* SvGlobalName::MakeId() +|* SvGlobalName::MakeId() *************************************************************************/ BOOL SvGlobalName::MakeId( const String & rIdStr ) { - ByteString aStr( rIdStr, RTL_TEXTENCODING_ASCII_US ); + ByteString aStr( rIdStr, RTL_TEXTENCODING_ASCII_US ); sal_Char * pStr = (sal_Char *)aStr.GetBuffer(); if( rIdStr.Len() == 36 && '-' == pStr[ 8 ] && '-' == pStr[ 13 ] @@ -286,7 +286,7 @@ BOOL SvGlobalName::MakeId( const String & rIdStr ) } NewImp(); - *(UINT32 *)pImp->szData = nFirst; + *(UINT32 *)pImp->szData = nFirst; *(USHORT *)&pImp->szData[ 4 ] = nSec; *(USHORT *)&pImp->szData[ 6 ] = nThird; memcpy( &pImp->szData[ 8 ], szRemain, 8 ); @@ -296,7 +296,7 @@ BOOL SvGlobalName::MakeId( const String & rIdStr ) } /************************************************************************* -|* SvGlobalName::GetctorName() +|* SvGlobalName::GetctorName() *************************************************************************/ String SvGlobalName::GetctorName() const { @@ -322,7 +322,7 @@ String SvGlobalName::GetctorName() const } /************************************************************************* -|* SvGlobalName::GetHexName() +|* SvGlobalName::GetHexName() *************************************************************************/ String SvGlobalName::GetHexName() const { @@ -356,7 +356,7 @@ String SvGlobalName::GetHexName() const /************** SvGlobalNameList ****************************************/ /************************************************************************/ /************************************************************************* -|* SvGlobalNameList::SvGlobalNameList() +|* SvGlobalNameList::SvGlobalNameList() *************************************************************************/ SvGlobalNameList::SvGlobalNameList() : aList( 1, 1 ) @@ -364,7 +364,7 @@ SvGlobalNameList::SvGlobalNameList() } /************************************************************************* -|* SvGlobalNameList::~SvGlobalNameList() +|* SvGlobalNameList::~SvGlobalNameList() *************************************************************************/ SvGlobalNameList::~SvGlobalNameList() { @@ -378,7 +378,7 @@ SvGlobalNameList::~SvGlobalNameList() } /************************************************************************* -|* SvGlobalNameList::Append() +|* SvGlobalNameList::Append() *************************************************************************/ void SvGlobalNameList::Append( const SvGlobalName & rName ) { @@ -387,7 +387,7 @@ void SvGlobalNameList::Append( const SvGlobalName & rName ) } /************************************************************************* -|* SvGlobalNameList::GetObject() +|* SvGlobalNameList::GetObject() *************************************************************************/ SvGlobalName SvGlobalNameList::GetObject( ULONG nPos ) { @@ -395,7 +395,7 @@ SvGlobalName SvGlobalNameList::GetObject( ULONG nPos ) } /************************************************************************* -|* SvGlobalNameList::IsEntry() +|* SvGlobalNameList::IsEntry() *************************************************************************/ BOOL SvGlobalNameList::IsEntry( const SvGlobalName & rName ) { diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx index e9d6ea191682..e0412fd5d675 100644 --- a/tools/source/ref/pstm.cxx +++ b/tools/source/ref/pstm.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ /***********************************************************************/ /************************************************************************ -|* SvClassManager::Register() +|* SvClassManager::Register() *************************************************************************/ void SvClassManager::Register( USHORT nClassId, SvCreateInstancePersist pFunc ) { @@ -48,7 +48,7 @@ void SvClassManager::Register( USHORT nClassId, SvCreateInstancePersist pFunc ) } /************************************************************************ -|* SvClassManager::Get() +|* SvClassManager::Get() *************************************************************************/ SvCreateInstancePersist SvClassManager::Get( USHORT nClassId ) { @@ -66,11 +66,11 @@ SvPersistBaseMemberList::SvPersistBaseMemberList( USHORT nInitSz, USHORT nResize ) : SuperSvPersistBaseMemberList( nInitSz, nResize ){} -#define PERSIST_LIST_VER (BYTE)0 -#define PERSIST_LIST_DBGUTIL (BYTE)0x80 +#define PERSIST_LIST_VER (BYTE)0 +#define PERSIST_LIST_DBGUTIL (BYTE)0x80 /************************************************************************ -|* SvPersistBaseMemberList::WriteOnlyStreamedObjects() +|* SvPersistBaseMemberList::WriteOnlyStreamedObjects() *************************************************************************/ void SvPersistBaseMemberList::WriteObjects( SvPersistStream & rStm, BOOL bOnlyStreamed ) const @@ -111,7 +111,7 @@ void SvPersistBaseMemberList::WriteObjects( SvPersistStream & rStm, } /************************************************************************ -|* operator << () +|* operator << () *************************************************************************/ SvPersistStream& operator << ( SvPersistStream & rStm, const SvPersistBaseMemberList & rLst ) @@ -121,7 +121,7 @@ SvPersistStream& operator << ( SvPersistStream & rStm, } /************************************************************************ -|* operator >> () +|* operator >> () *************************************************************************/ SvPersistStream& operator >> ( SvPersistStream & rStm, SvPersistBaseMemberList & rLst ) @@ -164,11 +164,11 @@ SvPersistStream& operator >> ( SvPersistStream & rStm, //========================================================================= SvPersistStream::SvPersistStream ( - SvClassManager & rMgr, /* Alle Factorys, deren Objekt geladen und + SvClassManager & rMgr, /* Alle Factorys, deren Objekt geladen und gespeichert werdn k"onnen */ - SvStream * pStream, /* Dieser Stream wird als Medium genommen, auf + SvStream * pStream, /* Dieser Stream wird als Medium genommen, auf dem der PersistStream arbeitet */ - UINT32 nStartIdxP /* Ab diesem Index werden die Id's f"ur + UINT32 nStartIdxP /* Ab diesem Index werden die Id's f"ur die Objekte vergeben, er muss gr"osser als Null sein. */ ) @@ -178,7 +178,7 @@ SvPersistStream::SvPersistStream , nStartIdx( nStartIdxP ) , pRefStm( NULL ) , nFlags( 0 ) -/* [Beschreibung] +/* [Beschreibung] Der Konstruktor der Klasse SvPersistStream. Die Objekte rMgr und pStream d"urfen nicht ver"andert werden, solange sie in einem @@ -199,9 +199,9 @@ SvPersistStream::SvPersistStream //========================================================================= SvPersistStream::SvPersistStream ( - SvClassManager & rMgr, /* Alle Factorys, deren Objekt geladen und + SvClassManager & rMgr, /* Alle Factorys, deren Objekt geladen und gespeichert werdn k"onnen */ - SvStream * pStream, /* Dieser Stream wird als Medium genommen, auf + SvStream * pStream, /* Dieser Stream wird als Medium genommen, auf dem der PersistStream arbeitet */ const SvPersistStream & rPersStm /* Wenn PersistStream's verschachtelt werden, @@ -214,7 +214,7 @@ SvPersistStream::SvPersistStream , nStartIdx( rPersStm.GetCurMaxIndex() +1 ) , pRefStm( &rPersStm ) , nFlags( 0 ) -/* [Beschreibung] +/* [Beschreibung] Der Konstruktor der Klasse SvPersistStream. Die Objekte rMgr und pStream d"urfen nicht ver"andert werden, solange sie in einem @@ -236,7 +236,7 @@ SvPersistStream::SvPersistStream //========================================================================= SvPersistStream::~SvPersistStream() -/* [Beschreibung] +/* [Beschreibung] Der Detruktor ruft die Methode <SvPersistStream::SetStream> mit NULL. @@ -248,10 +248,10 @@ SvPersistStream::~SvPersistStream() //========================================================================= void SvPersistStream::SetStream ( - SvStream * pStream /* auf diesem Stream arbeitet der PersistStream */ + SvStream * pStream /* auf diesem Stream arbeitet der PersistStream */ ) -/* [Beschreibung] +/* [Beschreibung] Es wird ein Medium (pStream) eingesetzt, auf dem PersistStream arbeitet. Dieses darf nicht von aussen modifiziert werden, solange es @@ -280,13 +280,13 @@ void SvPersistStream::SetStream //========================================================================= USHORT SvPersistStream::IsA() const -/* [Beschreibung] +/* [Beschreibung] Gibt den Identifier dieses Streamklasse zur"uck. [R"uckgabewert] - USHORT ID_PERSISTSTREAM wird zur"uckgegeben. + USHORT ID_PERSISTSTREAM wird zur"uckgegeben. [Querverweise] @@ -299,7 +299,7 @@ USHORT SvPersistStream::IsA() const /************************************************************************* -|* SvPersistStream::ResetError() +|* SvPersistStream::ResetError() *************************************************************************/ void SvPersistStream::ResetError() { @@ -309,7 +309,7 @@ void SvPersistStream::ResetError() } /************************************************************************* -|* SvPersistStream::GetData() +|* SvPersistStream::GetData() *************************************************************************/ ULONG SvPersistStream::GetData( void* pData, ULONG nSize ) { @@ -320,7 +320,7 @@ ULONG SvPersistStream::GetData( void* pData, ULONG nSize ) } /************************************************************************* -|* SvPersistStream::PutData() +|* SvPersistStream::PutData() *************************************************************************/ ULONG SvPersistStream::PutData( const void* pData, ULONG nSize ) { @@ -331,7 +331,7 @@ ULONG SvPersistStream::PutData( const void* pData, ULONG nSize ) } /************************************************************************* -|* SvPersistStream::Seek() +|* SvPersistStream::Seek() *************************************************************************/ ULONG SvPersistStream::SeekPos( ULONG nPos ) { @@ -342,14 +342,14 @@ ULONG SvPersistStream::SeekPos( ULONG nPos ) } /************************************************************************* -|* SvPersistStream::FlushData() +|* SvPersistStream::FlushData() *************************************************************************/ void SvPersistStream::FlushData() { } /************************************************************************* -|* SvPersistStream::GetCurMaxIndex() +|* SvPersistStream::GetCurMaxIndex() *************************************************************************/ ULONG SvPersistStream::GetCurMaxIndex( const SvPersistUIdx & rIdx ) const { @@ -366,7 +366,7 @@ ULONG SvPersistStream::GetCurMaxIndex( const SvPersistUIdx & rIdx ) const } /************************************************************************* -|* SvPersistStream::GetIndex() +|* SvPersistStream::GetIndex() *************************************************************************/ ULONG SvPersistStream::GetIndex( SvPersistBase * pObj ) const { @@ -377,7 +377,7 @@ ULONG SvPersistStream::GetIndex( SvPersistBase * pObj ) const } /************************************************************************* -|* SvPersistStream::GetObject) +|* SvPersistStream::GetObject) *************************************************************************/ SvPersistBase * SvPersistStream::GetObject( ULONG nIdx ) const { @@ -389,30 +389,30 @@ SvPersistBase * SvPersistStream::GetObject( ULONG nIdx ) const } //========================================================================= -#define LEN_1 0x80 -#define LEN_2 0x40 -#define LEN_4 0x20 -#define LEN_5 0x10 +#define LEN_1 0x80 +#define LEN_2 0x40 +#define LEN_4 0x20 +#define LEN_5 0x10 UINT32 SvPersistStream::ReadCompressed ( - SvStream & rStm /* Aus diesem Stream werden die komprimierten Daten + SvStream & rStm /* Aus diesem Stream werden die komprimierten Daten gelesen */ ) -/* [Beschreibung] +/* [Beschreibung] Ein im Stream komprimiert abgelegtes Wort wird gelesen. In welchem Format komprimiert wird, siehe <SvPersistStream::WriteCompressed>. [R"uckgabewert] - UINT32 Das nicht komprimierte Wort wird zur"uckgegeben. + UINT32 Das nicht komprimierte Wort wird zur"uckgegeben. [Querverweise] */ { UINT32 nRet(0); - BYTE nMask; + BYTE nMask; rStm >> nMask; if( nMask & LEN_1 ) nRet = ~LEN_1 & nMask; @@ -456,16 +456,16 @@ void SvPersistStream::WriteCompressed ( SvStream & rStm,/* Aus diesem Stream werden die komprimierten Daten gelesen */ - UINT32 nVal /* Dieser Wert wird komprimiert geschrieben */ + UINT32 nVal /* Dieser Wert wird komprimiert geschrieben */ ) -/* [Beschreibung] +/* [Beschreibung] Das "ubergebene Wort wird komprimiert und in den Stream geschrieben. Folgendermassen wir komprimiert. - nVal < 0x80 => 0x80 + nVal ist 1 Byte gross. - nVal < 0x4000 => 0x4000 + nVal ist 2 Byte gross. - nVal < 0x20000000 => 0x20000000 + nVal ist 4 Byte gross. - nVal > 0x1FFFFFFF => 0x1000000000+ nVal ist 5 Byte gross. + nVal < 0x80 => 0x80 + nVal ist 1 Byte gross. + nVal < 0x4000 => 0x4000 + nVal ist 2 Byte gross. + nVal < 0x20000000 => 0x20000000 + nVal ist 4 Byte gross. + nVal > 0x1FFFFFFF => 0x1000000000+ nVal ist 5 Byte gross. [Querverweise] @@ -498,14 +498,14 @@ void SvPersistStream::WriteCompressed //========================================================================= UINT32 SvPersistStream::WriteDummyLen() -/* [Beschreibung] +/* [Beschreibung] Die Methode schreibt 4 Byte in den Stream und gibt die Streamposition zur"uck. [R"uckgabewert] - UINT32 Die Position hinter der L"angenangabe wird zur"uckgegeben. + UINT32 Die Position hinter der L"angenangabe wird zur"uckgegeben. [Beispiel] @@ -536,10 +536,10 @@ UINT32 SvPersistStream::WriteDummyLen() //========================================================================= void SvPersistStream::WriteLen ( - UINT32 nObjPos /* die Position + 4, an der die L"ange geschrieben + UINT32 nObjPos /* die Position + 4, an der die L"ange geschrieben wird. */ ) -/* [Beschreibung] +/* [Beschreibung] Die Methode schreibt die Differenz zwischen der aktuellen und nObjPos als UINT32 an die Position nObjPos -4 im Stream. Danach @@ -573,11 +573,11 @@ void SvPersistStream::WriteLen //========================================================================= UINT32 SvPersistStream::ReadLen ( - UINT32 * pTestPos /* Die Position des Streams, nach dem Lesen der + UINT32 * pTestPos /* Die Position des Streams, nach dem Lesen der L"ange, wird zur"uckgegeben. Es darf auch NULL "ubergeben werden. */ ) -/* [Beschreibung] +/* [Beschreibung] Liest die L"ange die vorher mit <SvPersistStream::WriteDummyLen> und <SvPersistStream::WriteLen> geschrieben wurde. @@ -593,19 +593,19 @@ UINT32 SvPersistStream::ReadLen //========================================================================= // Dateirormat abw"arts kompatibel #ifdef STOR_NO_OPTIMIZE -#define P_VER (BYTE)0x00 +#define P_VER (BYTE)0x00 #else -#define P_VER (BYTE)0x01 +#define P_VER (BYTE)0x01 #endif -#define P_VER_MASK (BYTE)0x0F -#define P_ID_0 (BYTE)0x80 -#define P_OBJ (BYTE)0x40 -#define P_DBGUTIL (BYTE)0x20 -#define P_ID (BYTE)0x10 +#define P_VER_MASK (BYTE)0x0F +#define P_ID_0 (BYTE)0x80 +#define P_OBJ (BYTE)0x40 +#define P_DBGUTIL (BYTE)0x20 +#define P_ID (BYTE)0x10 #ifdef STOR_NO_OPTIMIZE -#define P_STD P_DBGUTIL +#define P_STD P_DBGUTIL #else -#define P_STD 0 +#define P_STD 0 #endif static void WriteId @@ -725,15 +725,15 @@ SvPersistStream& SvPersistStream::WritePointer //========================================================================= UINT32 SvPersistStream::ReadObj ( - SvPersistBase * & rpObj, - BOOL bRegister + SvPersistBase * & rpObj, + BOOL bRegister ) { - BYTE nHdr; - UINT32 nId = 0; - USHORT nClassId; + BYTE nHdr; + UINT32 nId = 0; + USHORT nClassId; - rpObj = NULL; // Spezifikation: Im Fehlerfall 0. + rpObj = NULL; // Spezifikation: Im Fehlerfall 0. ReadId( *this, nHdr, nId, nClassId ); // reine Versionsnummer durch maskieren diff --git a/tools/source/ref/ref.cxx b/tools/source/ref/ref.cxx index eb38694da74d..eeee931f9182 100644 --- a/tools/source/ref/ref.cxx +++ b/tools/source/ref/ref.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,14 +34,14 @@ SV_IMPL_REF_LIST( SvRefBase,SvRefBase* ) /************************************************************************** -#* SvRefBase::~SvRefBase() +#* SvRefBase::~SvRefBase() **************************************************************************/ SvRefBase::~SvRefBase() { } /************************************************************************** -#* SvRefBase::QueryDelete() +#* SvRefBase::QueryDelete() **************************************************************************/ void SvRefBase::QueryDelete() { diff --git a/tools/source/solar/solar.c b/tools/source/solar/solar.c index a331fcd8a355..608f0baf5129 100644 --- a/tools/source/solar/solar.c +++ b/tools/source/solar/solar.c @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,20 +55,20 @@ #include <setjmp.h> #endif -#define printTypeSize(Type,Name) printf( "sizeof(%s)\t= %d\n", Name, sizeof (Type) ) +#define printTypeSize(Type,Name) printf( "sizeof(%s)\t= %d\n", Name, sizeof (Type) ) -#define isSignedType(Type) (((Type)-1) < 0) -#define printTypeSign(Type,Name) printf( "%s\t= %s %s\n", Name, ( isSignedType(Type) ? "signed" : "unsigned" ), Name ) +#define isSignedType(Type) (((Type)-1) < 0) +#define printTypeSign(Type,Name) printf( "%s\t= %s %s\n", Name, ( isSignedType(Type) ? "signed" : "unsigned" ), Name ) /************************************************************************* |* -|* IsBigEndian() +|* IsBigEndian() |* -|* Beschreibung True, wenn CPU BigEndian ist +|* Beschreibung True, wenn CPU BigEndian ist |* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung +|* Ersterstellung EG 26.06.96 +|* Letzte Aenderung |* *************************************************************************/ int IsBigEndian() @@ -79,12 +79,12 @@ int IsBigEndian() /************************************************************************* |* -|* IsStackGrowingDown() +|* IsStackGrowingDown() |* -|* Beschreibung True, wenn der Stack nach unten waechst +|* Beschreibung True, wenn der Stack nach unten waechst |* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung +|* Ersterstellung EG 26.06.96 +|* Letzte Aenderung |* *************************************************************************/ int IsStackGrowingDown_2( int * pI ) @@ -101,13 +101,13 @@ int IsStackGrowingDown() /************************************************************************* |* -|* GetStackAlignment() +|* GetStackAlignment() |* -|* Beschreibung Alignment von char Parametern, die (hoffentlich) -|* ueber den Stack uebergeben werden +|* Beschreibung Alignment von char Parametern, die (hoffentlich) +|* ueber den Stack uebergeben werden |* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung +|* Ersterstellung EG 26.06.96 +|* Letzte Aenderung |* *************************************************************************/ int GetStackAlignment_3( char*p, long l, int i, short s, char b, char c, ... ) @@ -137,7 +137,7 @@ int GetStackAlignment() /************************************************************************* |* -|* Typdeclarations for memory access test functions +|* Typdeclarations for memory access test functions |* *************************************************************************/ typedef enum { t_char, t_short, t_int, t_long, t_double } Type; @@ -146,12 +146,12 @@ typedef int (*TestFunc)( Type, void* ); /************************************************************************* |* -|* PrintArgs() +|* PrintArgs() |* -|* Beschreibung Testfunktion fuer variable Parameter +|* Beschreibung Testfunktion fuer variable Parameter |* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung +|* Ersterstellung EG 26.06.96 +|* Letzte Aenderung |* *************************************************************************/ #ifdef I_STDARG @@ -183,12 +183,12 @@ va_dcl #ifndef USE_FORK_TO_CHECK /************************************************************************* |* -|* SignalHdl() +|* SignalHdl() |* -|* Beschreibung faengt SIGBUS und SIGSEGV in check() ab +|* Beschreibung faengt SIGBUS und SIGSEGV in check() ab |* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung +|* Ersterstellung EG 26.06.96 +|* Letzte Aenderung |* *************************************************************************/ static jmp_buf check_env; @@ -196,22 +196,22 @@ static int bSignal; void SignalHdl( int sig ) { bSignal = 1; - + fprintf( stderr, "Signal %d caught\n", sig ); - signal( SIGSEGV, SIG_DFL ); - signal( SIGBUS, SIG_DFL ); + signal( SIGSEGV, SIG_DFL ); + signal( SIGBUS, SIG_DFL ); siglongjmp( check_env, sig ); } #endif /************************************************************************* |* -|* check() +|* check() |* -|* Beschreibung Testet MemoryZugriff (read/write) +|* Beschreibung Testet MemoryZugriff (read/write) |* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung +|* Ersterstellung EG 26.06.96 +|* Letzte Aenderung |* *************************************************************************/ int check( TestFunc func, Type eT, void* p ) @@ -238,11 +238,11 @@ int check( TestFunc func, Type eT, void* p ) if ( !sigsetjmp( check_env, 1 ) ) { - signal( SIGSEGV, SignalHdl ); - signal( SIGBUS, SignalHdl ); + signal( SIGSEGV, SignalHdl ); + signal( SIGBUS, SignalHdl ); result = func( eT, p ); - signal( SIGSEGV, SIG_DFL ); - signal( SIGBUS, SIG_DFL ); + signal( SIGSEGV, SIG_DFL ); + signal( SIGBUS, SIG_DFL ); } if ( bSignal ) @@ -254,46 +254,46 @@ int check( TestFunc func, Type eT, void* p ) /************************************************************************* |* -|* GetAtAddress() +|* GetAtAddress() |* -|* Beschreibung memory read access +|* Beschreibung memory read access |* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung +|* Ersterstellung EG 26.06.96 +|* Letzte Aenderung |* *************************************************************************/ int GetAtAddress( Type eT, void* p ) { switch ( eT ) { - case t_char: return *((char*)p); - case t_short: return *((short*)p); - case t_int: return *((int*)p); - case t_long: return *((long*)p); - case t_double: return *((double*)p); + case t_char: return *((char*)p); + case t_short: return *((short*)p); + case t_int: return *((int*)p); + case t_long: return *((long*)p); + case t_double: return *((double*)p); } abort(); } /************************************************************************* |* -|* SetAtAddress() +|* SetAtAddress() |* -|* Beschreibung memory write access +|* Beschreibung memory write access |* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung +|* Ersterstellung EG 26.06.96 +|* Letzte Aenderung |* *************************************************************************/ int SetAtAddress( Type eT, void* p ) { switch ( eT ) { - case t_char: return *((char*)p) = 0; - case t_short: return *((short*)p) = 0; - case t_int: return *((int*)p) = 0; - case t_long: return *((long*)p) = 0; - case t_double: return *((double*)p)= 0; + case t_char: return *((char*)p) = 0; + case t_short: return *((short*)p) = 0; + case t_int: return *((int*)p) = 0; + case t_long: return *((long*)p) = 0; + case t_double: return *((double*)p)= 0; } abort(); } @@ -302,24 +302,24 @@ char* TypeName( Type eT ) { switch ( eT ) { - case t_char: return "char"; - case t_short: return "short"; - case t_int: return "int"; - case t_long: return "long"; - case t_double: return "double"; + case t_char: return "char"; + case t_short: return "short"; + case t_int: return "int"; + case t_long: return "long"; + case t_double: return "double"; } abort(); } /************************************************************************* |* -|* Check(Get|Set)Access() +|* Check(Get|Set)Access() |* -|* Beschreibung Testet MemoryZugriff (read/write) -|* Zugriffsverletzungen werden abgefangen +|* Beschreibung Testet MemoryZugriff (read/write) +|* Zugriffsverletzungen werden abgefangen |* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung +|* Ersterstellung EG 26.06.96 +|* Letzte Aenderung |* *************************************************************************/ int CheckGetAccess( Type eT, void* p ) @@ -348,19 +348,19 @@ int CheckSetAccess( Type eT, void* p ) /************************************************************************* |* -|* GetAlignment() +|* GetAlignment() |* -|* Beschreibung Bestimmt das Alignment verschiedener Typen +|* Beschreibung Bestimmt das Alignment verschiedener Typen |* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung +|* Ersterstellung EG 26.06.96 +|* Letzte Aenderung |* *************************************************************************/ int GetAlignment( Type eT ) { - char a[ 16*8 ]; - long p = (long)(void*)a; - int i; + char a[ 16*8 ]; + long p = (long)(void*)a; + int i; /* clear a[...] to set legal value for double access */ for ( i = 0; i < 16*8; i++ ) @@ -375,37 +375,37 @@ int GetAlignment( Type eT ) /************************************************************************* |* -|* struct Description +|* struct Description |* -|* Beschreibung Beschreibt die Parameter der Architektur +|* Beschreibung Beschreibt die Parameter der Architektur |* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung +|* Ersterstellung EG 26.06.96 +|* Letzte Aenderung |* *************************************************************************/ struct Description { - int bBigEndian; - int bStackGrowsDown; - int nStackAlignment; - int nAlignment[3]; /* 2,4,8 */ + int bBigEndian; + int bStackGrowsDown; + int nStackAlignment; + int nAlignment[3]; /* 2,4,8 */ }; /************************************************************************* |* -|* Description_Ctor() +|* Description_Ctor() |* -|* Beschreibung Bestimmt die Parameter der Architektur +|* Beschreibung Bestimmt die Parameter der Architektur |* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung +|* Ersterstellung EG 26.06.96 +|* Letzte Aenderung |* *************************************************************************/ void Description_Ctor( struct Description* pThis ) { - pThis->bBigEndian = IsBigEndian(); - pThis->bStackGrowsDown = IsStackGrowingDown(); - pThis->nStackAlignment = GetStackAlignment(); + pThis->bBigEndian = IsBigEndian(); + pThis->bStackGrowsDown = IsStackGrowingDown(); + pThis->nStackAlignment = GetStackAlignment(); if ( sizeof(short) != 2 ) abort(); @@ -414,7 +414,7 @@ void Description_Ctor( struct Description* pThis ) abort(); pThis->nAlignment[1] = GetAlignment( t_int ); - if ( sizeof(long) == 8 ) + if ( sizeof(long) == 8 ) pThis->nAlignment[2] = GetAlignment( t_long ); else if ( sizeof(double) == 8 ) pThis->nAlignment[2] = GetAlignment( t_double ); @@ -424,12 +424,12 @@ void Description_Ctor( struct Description* pThis ) /************************************************************************* |* -|* Description_Print() +|* Description_Print() |* -|* Beschreibung Schreibt die Parameter der Architektur als Header +|* Beschreibung Schreibt die Parameter der Architektur als Header |* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung +|* Ersterstellung EG 26.06.96 +|* Letzte Aenderung |* *************************************************************************/ void Description_Print( struct Description* pThis, char* name ) @@ -461,12 +461,12 @@ void Description_Print( struct Description* pThis, char* name ) /************************************************************************* |* -|* InfoMemoryAccess() +|* InfoMemoryAccess() |* -|* Beschreibung Informeller Bytezugriffstest +|* Beschreibung Informeller Bytezugriffstest |* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung +|* Ersterstellung EG 26.06.96 +|* Letzte Aenderung |* *************************************************************************/ void InfoMemoryAccess( char* p ) @@ -484,12 +484,12 @@ void InfoMemoryAccess( char* p ) /************************************************************************* |* -|* InfoMemoryTypeAccess() +|* InfoMemoryTypeAccess() |* -|* Beschreibung Informeller Zugriffstest verschiedener Typen +|* Beschreibung Informeller Zugriffstest verschiedener Typen |* -|* Ersterstellung EG 15.08.96 -|* Letzte Aenderung +|* Ersterstellung EG 15.08.96 +|* Letzte Aenderung |* *************************************************************************/ void InfoMemoryTypeAccess( Type eT ) @@ -509,7 +509,7 @@ void InfoMemoryTypeAccess( Type eT ) } /************************************************************************ * - * Use C code to determine the characteristics of the building platform. + * Use C code to determine the characteristics of the building platform. * ************************************************************************/ int main( int argc, char* argv[] ) diff --git a/tools/source/stream/cachestr.cxx b/tools/source/stream/cachestr.cxx index 62e3e107e2ed..0233dc25fb52 100644 --- a/tools/source/stream/cachestr.cxx +++ b/tools/source/stream/cachestr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,10 +48,10 @@ SvCacheStream::SvCacheStream( ULONG nMaxMemSize ) if( !nMaxMemSize ) nMaxMemSize = 20480; SvStream::bIsWritable = TRUE; - nMaxSize = nMaxMemSize; - bPersistent = FALSE; - pSwapStream = 0; - pCurrentStream = new SvMemoryStream( nMaxMemSize ); + nMaxSize = nMaxMemSize; + bPersistent = FALSE; + pSwapStream = 0; + pCurrentStream = new SvMemoryStream( nMaxMemSize ); pTempFile = 0; } @@ -78,11 +78,11 @@ SvCacheStream::SvCacheStream( const String &rFileName, nExpectedSize = 4096; SvStream::bIsWritable = TRUE; - nMaxSize = nMaxMemSize; - bPersistent = TRUE; - aFileName = rFileName; - pSwapStream = 0; - pCurrentStream = new SvMemoryStream( nExpectedSize ); + nMaxSize = nMaxMemSize; + bPersistent = TRUE; + aFileName = rFileName; + pSwapStream = 0; + pCurrentStream = new SvMemoryStream( nExpectedSize ); pTempFile = 0; } diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index e4395cf1ac7d..9fdef8436f1a 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -862,9 +862,9 @@ sal_Bool SvStream::ReadCString( ByteString& rStr ) while( *pPtr && nLen ) ++pPtr, --nLen; - bEnd = ( nReallyRead < sizeof(buf)-1 ) // read less than attempted to read + bEnd = ( nReallyRead < sizeof(buf)-1 ) // read less than attempted to read || ( ( nLen > 0 ) // OR it is inside the block we read - && ( 0 == *pPtr ) // AND found a string terminator + && ( 0 == *pPtr ) // AND found a string terminator ); rStr.Append( buf, ::sal::static_int_cast< xub_StrLen >( pPtr - buf ) ); diff --git a/tools/source/stream/strmos2.cxx b/tools/source/stream/strmos2.cxx index 932eca1fb6d2..d211d7790b08 100644 --- a/tools/source/stream/strmos2.cxx +++ b/tools/source/stream/strmos2.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -663,7 +663,7 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode ) createLongNameEA(aFileNameA.GetBuffer(), FILE_NORMAL, aDirEntry.GetName()); // und wieder oeffnen - ReOpen(); + ReOpen(); } #endif diff --git a/tools/source/stream/strmsys.cxx b/tools/source/stream/strmsys.cxx index 99490146c9db..a373ad985214 100644 --- a/tools/source/stream/strmsys.cxx +++ b/tools/source/stream/strmsys.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index 753b9a684763..88ccb2113e0d 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <errno.h> #include <unistd.h> #include <limits.h> -#include <stdlib.h> // fuer getenv() +#include <stdlib.h> // fuer getenv() #include <tools/debug.hxx> #include <tools/fsys.hxx> @@ -65,10 +65,10 @@ namespace { struct LockMutex : public rtl::Static< NAMESPACE_VOS(OMutex), LockMu class InternalStreamLock { - sal_Size m_nStartPos; - sal_Size m_nEndPos; - SvFileStream* m_pStream; - struct stat m_aStat; + sal_Size m_nStartPos; + sal_Size m_nEndPos; + SvFileStream* m_pStream; + struct stat m_aStat; InternalStreamLock( sal_Size, sal_Size, SvFileStream* ); ~InternalStreamLock(); @@ -228,9 +228,9 @@ static sal_uInt32 GetSvError( int nErrno ) { ENOLINK, SVSTREAM_PATH_NOT_FOUND }, #endif { ENOTDIR, SVSTREAM_PATH_NOT_FOUND }, - { ETXTBSY, SVSTREAM_ACCESS_DENIED }, - { EEXIST, SVSTREAM_CANNOT_MAKE }, - { ENOSPC, SVSTREAM_DISK_FULL }, + { ETXTBSY, SVSTREAM_ACCESS_DENIED }, + { EEXIST, SVSTREAM_CANNOT_MAKE }, + { ENOSPC, SVSTREAM_DISK_FULL }, { (int)0xFFFF, SVSTREAM_GENERALERROR } }; @@ -524,10 +524,10 @@ sal_Bool SvFileStream::LockRange( sal_Size nByteOffset, sal_Size nBytes ) // um einen Haenger im Zusammenspiel mit einem Linux // NFS-2-Server (kein Lockdaemon) zu verhindern. // File-Locking ?ber NFS ist generell ein Performancekiller. - // HR, 22.10.1997 fuer SOLARIS - // CP, 30.11.1997 fuer HPUX - // ER, 18.12.1997 fuer IRIX - // HR, 18.05.1998 Environmentvariable + // HR, 22.10.1997 fuer SOLARIS + // CP, 30.11.1997 fuer HPUX + // ER, 18.12.1997 fuer IRIX + // HR, 18.05.1998 Environmentvariable if ( pFileLockEnvVar == (char*)1 ) pFileLockEnvVar = getenv("STAR_ENABLE_FILE_LOCKING"); diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx index c806e7562322..d9e7da92296b 100644 --- a/tools/source/stream/strmwnt.cxx +++ b/tools/source/stream/strmwnt.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -482,7 +482,7 @@ void SvFileStream::Open( const String& rFilename, StreamMode nMode ) ByteString aFileNameA( aFilename, osl_getThreadTextEncoding()); FSysRedirector::DoRedirect( aFilename ); #endif - SetLastError( ERROR_SUCCESS ); // ggf. durch Redirector geaendert! + SetLastError( ERROR_SUCCESS ); // ggf. durch Redirector geaendert! /* #ifdef DBG_UTIL diff --git a/tools/source/stream/vcompat.cxx b/tools/source/stream/vcompat.cxx index fc5567fe3a52..8430eb17659b 100644 --- a/tools/source/stream/vcompat.cxx +++ b/tools/source/stream/vcompat.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/source/string/debugprint.cxx b/tools/source/string/debugprint.cxx index 9a21d2a4a5d7..7acff963b1b9 100644 --- a/tools/source/string/debugprint.cxx +++ b/tools/source/string/debugprint.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/source/string/strascii.cxx b/tools/source/string/strascii.cxx index 047bc14dc463..775e1ca7f142 100644 --- a/tools/source/string/strascii.cxx +++ b/tools/source/string/strascii.cxx @@ -1,7 +1,7 @@ #/************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/source/string/strcvt.cxx b/tools/source/string/strcvt.cxx index 9369724ebc8b..ef55dee5bfe2 100644 --- a/tools/source/string/strcvt.cxx +++ b/tools/source/string/strcvt.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,19 +114,19 @@ ByteString::ByteString( const sal_Unicode* pUniStr, xub_StrLen nLen, static sal_uChar aImplByteTab[256] = { - 0, 1, 2, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 66, 67, 68, 69, 70, 71, - 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, - 88, 89, 90, 91, 92, 93, 94, 95, - 96, 97, 98, 99, 100, 101, 102, 103, + 0, 1, 2, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, + 64, 65, 66, 67, 68, 69, 70, 71, + 72, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, @@ -152,20 +152,20 @@ static sal_uChar aImplByteTab[256] = struct Impl1ByteUnicodeTabData { - rtl_TextEncoding meTextEncoding; - sal_Unicode maUniTab[256]; - Impl1ByteUnicodeTabData* mpNext; + rtl_TextEncoding meTextEncoding; + sal_Unicode maUniTab[256]; + Impl1ByteUnicodeTabData* mpNext; }; // ----------------------------------------------------------------------- struct Impl1ByteConvertTabData { - rtl_TextEncoding meSrcTextEncoding; - rtl_TextEncoding meDestTextEncoding; - sal_uChar maConvertTab[256]; - sal_uChar maRepConvertTab[256]; - Impl1ByteConvertTabData* mpNext; + rtl_TextEncoding meSrcTextEncoding; + rtl_TextEncoding meDestTextEncoding; + sal_uChar maConvertTab[256]; + sal_uChar maRepConvertTab[256]; + Impl1ByteConvertTabData* mpNext; }; // ======================================================================= @@ -173,11 +173,11 @@ struct Impl1ByteConvertTabData sal_Unicode* ImplGet1ByteUnicodeTab( rtl_TextEncoding eTextEncoding ) { #ifndef BOOTSTRAP - TOOLSINDATA* pToolsData = ImplGetToolsInData(); + TOOLSINDATA* pToolsData = ImplGetToolsInData(); #else - TOOLSINDATA* pToolsData = 0x0; + TOOLSINDATA* pToolsData = 0x0; #endif - Impl1ByteUnicodeTabData* pTab = pToolsData->mpFirstUniTabData; + Impl1ByteUnicodeTabData* pTab = pToolsData->mpFirstUniTabData; while ( pTab ) { @@ -197,10 +197,10 @@ sal_Unicode* ImplGet1ByteUnicodeTab( rtl_TextEncoding eTextEncoding ) pTab->meTextEncoding = eTextEncoding; pTab->mpNext = pToolsData->mpFirstUniTabData; - rtl_TextToUnicodeConverter hConverter; - sal_uInt32 nInfo; - sal_Size nSrcBytes; - sal_Size nDestChars; + rtl_TextToUnicodeConverter hConverter; + sal_uInt32 nInfo; + sal_Size nSrcBytes; + sal_Size nDestChars; hConverter = rtl_createTextToUnicodeConverter( eTextEncoding ); nDestChars = rtl_convertTextToUnicode( hConverter, 0, (const sal_Char*)aImplByteTab, 256, @@ -230,11 +230,11 @@ static sal_uChar* ImplGet1ByteConvertTab( rtl_TextEncoding eSrcTextEncoding, BOOL bReplace ) { #ifndef BOOTSTRAP - TOOLSINDATA* pToolsData = ImplGetToolsInData(); + TOOLSINDATA* pToolsData = ImplGetToolsInData(); #else - TOOLSINDATA* pToolsData = 0x0; + TOOLSINDATA* pToolsData = 0x0; #endif - Impl1ByteConvertTabData* pTab = pToolsData->mpFirstConvertTabData; + Impl1ByteConvertTabData* pTab = pToolsData->mpFirstConvertTabData; while ( pTab ) { @@ -265,14 +265,14 @@ static sal_uChar* ImplGet1ByteConvertTab( rtl_TextEncoding eSrcTextEncoding, pTab->meDestTextEncoding = eDestTextEncoding; pTab->mpNext = pToolsData->mpFirstConvertTabData; - rtl_TextToUnicodeConverter hConverter; - rtl_UnicodeToTextConverter hConverter2; - sal_uInt32 nInfo; - sal_Size nSrcBytes; - sal_Size nDestChars; - sal_Size nSrcChars; - sal_Size nDestBytes; - sal_Unicode aTempBuf[256]; + rtl_TextToUnicodeConverter hConverter; + rtl_UnicodeToTextConverter hConverter2; + sal_uInt32 nInfo; + sal_Size nSrcBytes; + sal_Size nDestChars; + sal_Size nSrcChars; + sal_Size nDestBytes; + sal_Unicode aTempBuf[256]; hConverter = rtl_createTextToUnicodeConverter( eSrcTextEncoding ); nDestChars = rtl_convertTextToUnicode( hConverter, 0, (const sal_Char*)aImplByteTab, 256, @@ -325,12 +325,12 @@ static sal_uChar* ImplGet1ByteConvertTab( rtl_TextEncoding eSrcTextEncoding, void ImplDeleteCharTabData() { #ifndef BOOTSTRAP - TOOLSINDATA* pToolsData = ImplGetToolsInData(); + TOOLSINDATA* pToolsData = ImplGetToolsInData(); #else - TOOLSINDATA* pToolsData = 0x0; + TOOLSINDATA* pToolsData = 0x0; #endif - Impl1ByteUnicodeTabData* pTempUniTab; - Impl1ByteUnicodeTabData* pUniTab = pToolsData->mpFirstUniTabData; + Impl1ByteUnicodeTabData* pTempUniTab; + Impl1ByteUnicodeTabData* pUniTab = pToolsData->mpFirstUniTabData; while ( pUniTab ) { pTempUniTab = pUniTab->mpNext; @@ -339,8 +339,8 @@ void ImplDeleteCharTabData() } pToolsData->mpFirstUniTabData = NULL; - Impl1ByteConvertTabData* pTempConvertTab; - Impl1ByteConvertTabData* pConvertTab = pToolsData->mpFirstConvertTabData; + Impl1ByteConvertTabData* pTempConvertTab; + Impl1ByteConvertTabData* pConvertTab = pToolsData->mpFirstConvertTabData; while ( pConvertTab ) { pTempConvertTab = pConvertTab->mpNext; @@ -374,12 +374,12 @@ void ByteString::ImplStringConvert( } else { - rtl_UnicodeToTextConverter hSrcConverter = rtl_createTextToUnicodeConverter( eSource ); - sal_uInt32 nInfo; - sal_Size nSrcBytes; - sal_Size nDestChars; - sal_Size nTempLen; - sal_Unicode* pTempBuf; + rtl_UnicodeToTextConverter hSrcConverter = rtl_createTextToUnicodeConverter( eSource ); + sal_uInt32 nInfo; + sal_Size nSrcBytes; + sal_Size nDestChars; + sal_Size nTempLen; + sal_Unicode* pTempBuf; nTempLen = mpData->mnLen; pTempBuf = new sal_Unicode[nTempLen]; nDestChars = rtl_convertTextToUnicode( hSrcConverter, 0, @@ -482,8 +482,8 @@ sal_Unicode ByteString::ConvertToUnicode( char c, rtl_TextEncoding eTextEncoding char ByteString::ConvertFromUnicode( sal_Unicode c, rtl_TextEncoding eTextEncoding, BOOL bReplace ) { - sal_Size nLen; - char aBuf[30]; + sal_Size nLen; + char aBuf[30]; nLen = ConvertFromUnicode( c, aBuf, sizeof( aBuf ), eTextEncoding, bReplace ); if ( nLen == 1 ) return aBuf[0]; @@ -499,11 +499,11 @@ sal_Unicode ByteString::ConvertToUnicode( const char* pChar, sal_Size* pLen, rtl if ( eTextEncoding == RTL_TEXTENCODING_DONTKNOW ) return 0; - rtl_TextToUnicodeConverter hConverter; - sal_uInt32 nInfo; - sal_Size nSrcBytes; - sal_Size nDestChars; - sal_Unicode nConvChar; + rtl_TextToUnicodeConverter hConverter; + sal_uInt32 nInfo; + sal_Size nSrcBytes; + sal_Size nDestChars; + sal_Unicode nConvChar; hConverter = rtl_createTextToUnicodeConverter( eTextEncoding ); nDestChars = rtl_convertTextToUnicode( hConverter, 0, (const sal_Char*)pChar, *pLen, @@ -536,12 +536,12 @@ sal_Size ByteString::ConvertFromUnicode( sal_Unicode c, char* pBuf, sal_Size nBu if ( eTextEncoding == RTL_TEXTENCODING_DONTKNOW ) return '\0'; - rtl_UnicodeToTextConverter hConverter; - sal_uInt32 nInfo; - sal_Size nSrcChars; - sal_Size nDestBytes; - sal_Unicode cUni = c; - sal_uInt32 nFlags = RTL_UNICODETOTEXT_FLAGS_NONSPACING_IGNORE | + rtl_UnicodeToTextConverter hConverter; + sal_uInt32 nInfo; + sal_Size nSrcChars; + sal_Size nDestBytes; + sal_Unicode cUni = c; + sal_uInt32 nFlags = RTL_UNICODETOTEXT_FLAGS_NONSPACING_IGNORE | RTL_UNICODETOTEXT_FLAGS_CONTROL_IGNORE | RTL_UNICODETOTEXT_FLAGS_FLUSH; if ( bReplace ) diff --git a/tools/source/string/strimp.cxx b/tools/source/string/strimp.cxx index 704bdd0e5c3a..34038c576aa0 100644 --- a/tools/source/string/strimp.cxx +++ b/tools/source/string/strimp.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,9 +81,9 @@ static sal_Int32 ImplStringCompareWithoutZero( const STRCODE* pStr1, const STRCO static sal_Int32 ImplStringICompare( const STRCODE* pStr1, const STRCODE* pStr2 ) { - sal_Int32 nRet; - STRCODE c1; - STRCODE c2; + sal_Int32 nRet; + STRCODE c1; + STRCODE c2; do { // Ist das Zeichen zwischen 'A' und 'Z' dann umwandeln @@ -110,9 +110,9 @@ static sal_Int32 ImplStringICompare( const STRCODE* pStr1, const STRCODE* pStr2 static sal_Int32 ImplStringICompare( const STRCODE* pStr1, const STRCODE* pStr2, xub_StrLen nCount ) { - sal_Int32 nRet = 0; - STRCODE c1; - STRCODE c2; + sal_Int32 nRet = 0; + STRCODE c1; + STRCODE c2; do { if ( !nCount ) @@ -143,9 +143,9 @@ static sal_Int32 ImplStringICompare( const STRCODE* pStr1, const STRCODE* pStr2, static sal_Int32 ImplStringICompareWithoutZero( const STRCODE* pStr1, const STRCODE* pStr2, sal_Int32 nCount ) { - sal_Int32 nRet = 0; - STRCODE c1; - STRCODE c2; + sal_Int32 nRet = 0; + STRCODE c1; + STRCODE c2; do { if ( !nCount ) @@ -188,10 +188,10 @@ const char* DBGCHECKSTRING( const void* pString ) static STRINGDATA* ImplAllocData( sal_Int32 nLen ) { // Dann kopiere die Daten - STRINGDATA* pData = (STRINGDATA*)rtl_allocateMemory( sizeof(STRINGDATA)+(nLen*sizeof( STRCODE )) ); - pData->mnRefCount = 1; - pData->mnLen = nLen; - pData->maStr[nLen] = 0; + STRINGDATA* pData = (STRINGDATA*)rtl_allocateMemory( sizeof(STRINGDATA)+(nLen*sizeof( STRCODE )) ); + pData->mnRefCount = 1; + pData->mnLen = nLen; + pData->maStr[nLen] = 0; return pData; } @@ -199,8 +199,8 @@ static STRINGDATA* ImplAllocData( sal_Int32 nLen ) static STRINGDATA* _ImplCopyData( STRINGDATA* pData ) { - unsigned int nSize = sizeof(STRINGDATA)+(pData->mnLen*sizeof( STRCODE )); - STRINGDATA* pNewData = (STRINGDATA*)rtl_allocateMemory( nSize ); + unsigned int nSize = sizeof(STRINGDATA)+(pData->mnLen*sizeof( STRCODE )); + STRINGDATA* pNewData = (STRINGDATA*)rtl_allocateMemory( nSize ); memcpy( pNewData, pData, nSize ); pNewData->mnRefCount = 1; STRING_RELEASE((STRING_TYPE *)pData); @@ -246,7 +246,7 @@ inline sal_Int32 ImplGetCopyLen( sal_Int32 nStrLen, sal_Int32 nCopyLen ) // ======================================================================= -STRING::STRING() +STRING::STRING() : mpData(NULL) { DBG_CTOR( STRING, DBGCHECKSTRING ); @@ -1090,7 +1090,7 @@ STRING& STRING::ToLowerAscii() sal_Int32 nIndex = 0; sal_Int32 nLen = mpData->mnLen; - STRCODE* pStr = mpData->maStr; + STRCODE* pStr = mpData->maStr; while ( nIndex < nLen ) { // Ist das Zeichen zwischen 'A' und 'Z' dann umwandeln @@ -1116,7 +1116,7 @@ STRING& STRING::ToUpperAscii() sal_Int32 nIndex = 0; sal_Int32 nLen = mpData->mnLen; - STRCODE* pStr = mpData->maStr; + STRCODE* pStr = mpData->maStr; while ( nIndex < nLen ) { // Ist das Zeichen zwischen 'a' und 'z' dann umwandeln @@ -1141,11 +1141,11 @@ STRING& STRING::ConvertLineEnd( LineEnd eLineEnd ) DBG_CHKTHIS( STRING, DBGCHECKSTRING ); // Zeilenumbrueche ermitteln und neue Laenge berechnen - BOOL bConvert = FALSE; // Muss konvertiert werden - const STRCODE* pStr = mpData->maStr; // damit es schneller geht - xub_StrLen nLineEndLen = (eLineEnd == LINEEND_CRLF) ? 2 : 1; - xub_StrLen nLen = 0; // Ziel-Laenge - xub_StrLen i = 0; // Source-Zaehler + BOOL bConvert = FALSE; // Muss konvertiert werden + const STRCODE* pStr = mpData->maStr; // damit es schneller geht + xub_StrLen nLineEndLen = (eLineEnd == LINEEND_CRLF) ? 2 : 1; + xub_StrLen nLen = 0; // Ziel-Laenge + xub_StrLen i = 0; // Source-Zaehler while ( i < mpData->mnLen ) { @@ -1186,7 +1186,7 @@ STRING& STRING::ConvertLineEnd( LineEnd eLineEnd ) { // Neuen String anlegen STRINGDATA* pNewData = ImplAllocData( nLen ); - xub_StrLen j = 0; + xub_StrLen j = 0; i = 0; while ( i < mpData->mnLen ) { @@ -1195,7 +1195,7 @@ STRING& STRING::ConvertLineEnd( LineEnd eLineEnd ) { if ( eLineEnd == LINEEND_CRLF ) { - pNewData->maStr[j] = _CR; + pNewData->maStr[j] = _CR; pNewData->maStr[j+1] = _LF; j += 2; } @@ -1463,9 +1463,9 @@ xub_StrLen STRING::Match( const STRING& rStr ) const return STRING_MATCH; // Suche bis Stringende nach dem ersten nicht uebereinstimmenden Zeichen - const STRCODE* pStr1 = mpData->maStr; - const STRCODE* pStr2 = rStr.mpData->maStr; - xub_StrLen i = 0; + const STRCODE* pStr1 = mpData->maStr; + const STRCODE* pStr2 = rStr.mpData->maStr; + xub_StrLen i = 0; while ( i < mpData->mnLen ) { // Stimmt das Zeichen nicht ueberein, dann abbrechen @@ -1490,8 +1490,8 @@ xub_StrLen STRING::Match( const STRCODE* pCharStr ) const return STRING_MATCH; // Suche bis Stringende nach dem ersten nicht uebereinstimmenden Zeichen - const STRCODE* pStr = mpData->maStr; - xub_StrLen i = 0; + const STRCODE* pStr = mpData->maStr; + xub_StrLen i = 0; while ( i < mpData->mnLen ) { // Stimmt das Zeichen nicht ueberein, dann abbrechen @@ -1511,8 +1511,8 @@ xub_StrLen STRING::Search( STRCODE c, xub_StrLen nIndex ) const { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); - sal_Int32 nLen = mpData->mnLen; - const STRCODE* pStr = mpData->maStr; + sal_Int32 nLen = mpData->mnLen; + const STRCODE* pStr = mpData->maStr; pStr += nIndex; while ( nIndex < nLen ) { @@ -1579,7 +1579,7 @@ xub_StrLen STRING::Search( const STRCODE* pCharStr, xub_StrLen nIndex ) const DBG_CHKTHIS( STRING, DBGCHECKSTRING ); sal_Int32 nLen = mpData->mnLen; - xub_StrLen nStrLen = ImplStringLen( pCharStr ); + xub_StrLen nStrLen = ImplStringLen( pCharStr ); // Falls die Laenge des uebergebenen Strings 0 ist oder der Index // hinter dem String liegt, dann wurde der String nicht gefunden @@ -1645,13 +1645,13 @@ xub_StrLen STRING::SearchChar( const STRCODE* pChars, xub_StrLen nIndex ) const { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); - sal_Int32 nLen = mpData->mnLen; - const STRCODE* pStr = mpData->maStr; + sal_Int32 nLen = mpData->mnLen; + const STRCODE* pStr = mpData->maStr; pStr += nIndex; while ( nIndex < nLen ) { - STRCODE c = *pStr; - const STRCODE* pCompStr = pChars; + STRCODE c = *pStr; + const STRCODE* pCompStr = pChars; while ( *pCompStr ) { if ( *pCompStr == c ) @@ -1682,8 +1682,8 @@ xub_StrLen STRING::SearchCharBackward( const STRCODE* pChars, xub_StrLen nIndex nIndex--; pStr--; - STRCODE c =*pStr; - const STRCODE* pCompStr = pChars; + STRCODE c =*pStr; + const STRCODE* pCompStr = pChars; while ( *pCompStr ) { if ( *pCompStr == c ) @@ -1701,8 +1701,8 @@ xub_StrLen STRING::SearchAndReplace( STRCODE c, STRCODE cRep, xub_StrLen nIndex { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); - sal_Int32 nLen = mpData->mnLen; - const STRCODE* pStr = mpData->maStr; + sal_Int32 nLen = mpData->mnLen; + const STRCODE* pStr = mpData->maStr; pStr += nIndex; while ( nIndex < nLen ) { @@ -1756,9 +1756,9 @@ void STRING::SearchAndReplaceAll( STRCODE c, STRCODE cRep ) { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); - sal_Int32 nLen = mpData->mnLen; - const STRCODE* pStr = mpData->maStr; - sal_Int32 nIndex = 0; + sal_Int32 nLen = mpData->mnLen; + const STRCODE* pStr = mpData->maStr; + sal_Int32 nIndex = 0; while ( nIndex < nLen ) { if ( *pStr == c ) @@ -1815,10 +1815,10 @@ xub_StrLen STRING::GetTokenCount( STRCODE cTok ) const if ( !mpData->mnLen ) return 0; - xub_StrLen nTokCount = 1; - sal_Int32 nLen = mpData->mnLen; - const STRCODE* pStr = mpData->maStr; - sal_Int32 nIndex = 0; + xub_StrLen nTokCount = 1; + sal_Int32 nLen = mpData->mnLen; + const STRCODE* pStr = mpData->maStr; + sal_Int32 nIndex = 0; while ( nIndex < nLen ) { // Stimmt das Tokenzeichen ueberein, dann erhoehe TokCount @@ -1839,11 +1839,11 @@ void STRING::SetToken( xub_StrLen nToken, STRCODE cTok, const STRING& rStr, DBG_CHKTHIS( STRING, DBGCHECKSTRING ); DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING ); - const STRCODE* pStr = mpData->maStr; - xub_StrLen nLen = (xub_StrLen)mpData->mnLen; - xub_StrLen nTok = 0; - xub_StrLen nFirstChar = nIndex; - xub_StrLen i = nFirstChar; + const STRCODE* pStr = mpData->maStr; + xub_StrLen nLen = (xub_StrLen)mpData->mnLen; + xub_StrLen nTok = 0; + xub_StrLen nFirstChar = nIndex; + xub_StrLen i = nFirstChar; // Bestimme die Token-Position und Laenge pStr += i; @@ -1877,11 +1877,11 @@ STRING STRING::GetToken( xub_StrLen nToken, STRCODE cTok, xub_StrLen& rIndex ) c { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); - const STRCODE* pStr = mpData->maStr; - xub_StrLen nLen = (xub_StrLen)mpData->mnLen; - xub_StrLen nTok = 0; - xub_StrLen nFirstChar = rIndex; - xub_StrLen i = nFirstChar; + const STRCODE* pStr = mpData->maStr; + xub_StrLen nLen = (xub_StrLen)mpData->mnLen; + xub_StrLen nTok = 0; + xub_StrLen nFirstChar = rIndex; + xub_StrLen i = nFirstChar; // Bestimme die Token-Position und Laenge pStr += i; @@ -1933,13 +1933,13 @@ xub_StrLen STRING::GetQuotedTokenCount( const STRING& rQuotedPairs, STRCODE cTok if ( !mpData->mnLen ) return 0; - xub_StrLen nTokCount = 1; - sal_Int32 nLen = mpData->mnLen; - xub_StrLen nQuotedLen = rQuotedPairs.Len(); - STRCODE cQuotedEndChar = 0; - const STRCODE* pQuotedStr = rQuotedPairs.mpData->maStr; - const STRCODE* pStr = mpData->maStr; - sal_Int32 nIndex = 0; + xub_StrLen nTokCount = 1; + sal_Int32 nLen = mpData->mnLen; + xub_StrLen nQuotedLen = rQuotedPairs.Len(); + STRCODE cQuotedEndChar = 0; + const STRCODE* pQuotedStr = rQuotedPairs.mpData->maStr; + const STRCODE* pStr = mpData->maStr; + sal_Int32 nIndex = 0; while ( nIndex < nLen ) { STRCODE c = *pStr; @@ -1986,14 +1986,14 @@ STRING STRING::GetQuotedToken( xub_StrLen nToken, const STRING& rQuotedPairs, DBG_ASSERT( !(rQuotedPairs.Len()%2), "String::GetQuotedToken() - QuotedString%2 != 0" ); DBG_ASSERT( rQuotedPairs.Search(cTok) == STRING_NOTFOUND, "String::GetQuotedToken() - cTok in QuotedString" ); - const STRCODE* pStr = mpData->maStr; - const STRCODE* pQuotedStr = rQuotedPairs.mpData->maStr; - STRCODE cQuotedEndChar = 0; - xub_StrLen nQuotedLen = rQuotedPairs.Len(); - xub_StrLen nLen = (xub_StrLen)mpData->mnLen; - xub_StrLen nTok = 0; - xub_StrLen nFirstChar = rIndex; - xub_StrLen i = nFirstChar; + const STRCODE* pStr = mpData->maStr; + const STRCODE* pQuotedStr = rQuotedPairs.mpData->maStr; + STRCODE cQuotedEndChar = 0; + xub_StrLen nQuotedLen = rQuotedPairs.Len(); + xub_StrLen nLen = (xub_StrLen)mpData->mnLen; + xub_StrLen nTok = 0; + xub_StrLen nFirstChar = rIndex; + xub_StrLen i = nFirstChar; // Bestimme die Token-Position und Laenge pStr += i; diff --git a/tools/source/string/strucvt.cxx b/tools/source/string/strucvt.cxx index c2d716dbe5c2..9c9ef1dc4b5a 100644 --- a/tools/source/string/strucvt.cxx +++ b/tools/source/string/strucvt.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -142,8 +142,8 @@ UniString& UniString::Assign( const rtl::OUString& rStr ) OSL_ENSURE(rStr.pData->length < STRING_MAXLEN, "Overflowing rtl::OUString -> UniString cut to zero length"); - - + + if (rStr.pData->length < STRING_MAXLEN) { STRING_RELEASE((STRING_TYPE *)mpData); @@ -204,7 +204,7 @@ UniString::UniString( const ResId& rResId ) if( pResMgr ) pResMgr->PopContext(); } - + ResHookProc pImplResHookProc = ResMgr::GetReadStringHook(); if ( pImplResHookProc ) diff --git a/tools/source/string/tenccvt.cxx b/tools/source/string/tenccvt.cxx index 3209c072cb62..5237b24948a7 100644 --- a/tools/source/string/tenccvt.cxx +++ b/tools/source/string/tenccvt.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/source/string/tstring.cxx b/tools/source/string/tstring.cxx index 698ade9050ae..f2525e3bca84 100644 --- a/tools/source/string/tstring.cxx +++ b/tools/source/string/tstring.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,11 +62,11 @@ DBG_NAMEEX( UniString ) // ----------------------------------------------------------------------- -#define STRCODE sal_Char +#define STRCODE sal_Char #define STRCODEU unsigned char -#define STRING ByteString -#define STRINGDATA ByteStringData -#define DBGCHECKSTRING DbgCheckByteString +#define STRING ByteString +#define STRINGDATA ByteStringData +#define DBGCHECKSTRING DbgCheckByteString #define STRING_TYPE rtl_String #define STRING_ACQUIRE rtl_string_acquire #define STRING_RELEASE rtl_string_release @@ -240,7 +240,7 @@ BOOL ByteString::IsAlphaAscii() const while ( nIndex < nLen ) { if ( !(((*pStr >= 97) && (*pStr <= 122)) || - ((*pStr >= 65) && (*pStr <= 90))) ) + ((*pStr >= 65) && (*pStr <= 90))) ) return FALSE; ++pStr, @@ -283,8 +283,8 @@ BOOL ByteString::IsAlphaNumericAscii() const while ( nIndex < nLen ) { if ( !(((*pStr >= 97) && (*pStr <= 122)) || - ((*pStr >= 65) && (*pStr <= 90)) || - ((*pStr >= 48) && (*pStr <= 57))) ) + ((*pStr >= 65) && (*pStr <= 90)) || + ((*pStr >= 48) && (*pStr <= 57))) ) return FALSE; ++pStr, diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx index 99d207b7ded4..27dab841124d 100644 --- a/tools/source/string/tustring.cxx +++ b/tools/source/string/tustring.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,11 +56,11 @@ DBG_NAMEEX( ByteString ) // ----------------------------------------------------------------------- -#define STRCODE sal_Unicode +#define STRCODE sal_Unicode #define STRCODEU sal_Unicode -#define STRING UniString -#define STRINGDATA UniStringData -#define DBGCHECKSTRING DbgCheckUniString +#define STRING UniString +#define STRINGDATA UniStringData +#define DBGCHECKSTRING DbgCheckUniString #define STRING_TYPE rtl_uString #define STRING_ACQUIRE rtl_uString_acquire #define STRING_RELEASE rtl_uString_release diff --git a/tools/source/testtoolloader/testtoolloader.cxx b/tools/source/testtoolloader/testtoolloader.cxx index 0c42ba4338f1..ca269ef6eea2 100644 --- a/tools/source/testtoolloader/testtoolloader.cxx +++ b/tools/source/testtoolloader/testtoolloader.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ namespace tools typedef void ( *pfunc_CreateEventLogger)(); typedef void ( *pfunc_DestroyEventLogger)(); -static oslModule aTestToolModule = 0; +static oslModule aTestToolModule = 0; // are we to be automated at all? static bool bAutomate = false; static bool bLoggerStarted = false; @@ -105,7 +105,7 @@ void InitTestToolLib() if ( bAutomate ) { - OUString aFuncName( RTL_CONSTASCII_USTRINGPARAM( "CreateRemoteControl" )); + OUString aFuncName( RTL_CONSTASCII_USTRINGPARAM( "CreateRemoteControl" )); LoadLib(); if ( aTestToolModule ) @@ -127,7 +127,7 @@ void InitTestToolLib() if ( ::comphelper::UiEventsLogger::isEnabled() ) { - OUString aFuncName( RTL_CONSTASCII_USTRINGPARAM( "CreateEventLogger" )); + OUString aFuncName( RTL_CONSTASCII_USTRINGPARAM( "CreateEventLogger" )); LoadLib(); if ( aTestToolModule ) @@ -157,7 +157,7 @@ void DeInitTestToolLib() { if ( bAutomate ) { - OUString aFuncName( RTL_CONSTASCII_USTRINGPARAM( "DestroyRemoteControl" )); + OUString aFuncName( RTL_CONSTASCII_USTRINGPARAM( "DestroyRemoteControl" )); oslGenericFunction pDeInitFunc = osl_getFunctionSymbol( aTestToolModule, aFuncName.pData ); @@ -167,7 +167,7 @@ void DeInitTestToolLib() if ( bLoggerStarted /*::comphelper::UiEventsLogger::isEnabled()*/ ) { - OUString aFuncName( RTL_CONSTASCII_USTRINGPARAM( "DestroyEventLogger" )); + OUString aFuncName( RTL_CONSTASCII_USTRINGPARAM( "DestroyEventLogger" )); oslGenericFunction pDeInitFunc = osl_getFunctionSymbol( aTestToolModule, aFuncName.pData ); diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx index f2a3ab7602a1..f4f62162854a 100644 --- a/tools/source/zcodec/zcodec.cxx +++ b/tools/source/zcodec/zcodec.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #else #include "zlib/zlib.h" #endif -#endif +#endif #include <tools/zcodec.hxx> #include <rtl/crc.h> #include <osl/endian.h> @@ -79,7 +79,7 @@ ZCodec::ZCodec( void ) } // ------------------------------------------------------------------------ - + ZCodec::~ZCodec() { delete (z_stream*) mpsC_Stream; @@ -111,10 +111,10 @@ long ZCodec::EndCompression() if ( mbInit != 0 ) { - if ( mbInit & 2 ) // 1->decompress, 3->compress + if ( mbInit & 2 ) // 1->decompress, 3->compress { do - { + { ImplWriteBack(); } while ( deflate( PZSTREAM, Z_FINISH ) != Z_STREAM_END ); @@ -124,7 +124,7 @@ long ZCodec::EndCompression() retvalue = PZSTREAM->total_in; deflateEnd( PZSTREAM ); } - else + else { retvalue = PZSTREAM->total_out; inflateEnd( PZSTREAM ); @@ -139,9 +139,9 @@ long ZCodec::EndCompression() // ------------------------------------------------------------------------ long ZCodec::Compress( SvStream& rIStm, SvStream& rOStm ) -{ +{ long nOldTotal_In = PZSTREAM->total_in; - + if ( mbInit == 0 ) { mpIStm = &rIStm; @@ -151,9 +151,9 @@ long ZCodec::Compress( SvStream& rIStm, SvStream& rOStm ) } while (( PZSTREAM->avail_in = mpIStm->Read( PZSTREAM->next_in = mpInBuf, mnInBufSize )) != 0 ) { - if ( PZSTREAM->avail_out == 0 ) + if ( PZSTREAM->avail_out == 0 ) ImplWriteBack(); - if ( deflate( PZSTREAM, Z_NO_FLUSH ) < 0 ) + if ( deflate( PZSTREAM, Z_NO_FLUSH ) < 0 ) { mbStatus = FALSE; break; @@ -167,10 +167,10 @@ long ZCodec::Compress( SvStream& rIStm, SvStream& rOStm ) long ZCodec::Decompress( SvStream& rIStm, SvStream& rOStm ) { int err; - ULONG nInToRead; - long nOldTotal_Out = PZSTREAM->total_out; + ULONG nInToRead; + long nOldTotal_Out = PZSTREAM->total_out; - if ( mbFinish ) + if ( mbFinish ) return PZSTREAM->total_out - nOldTotal_Out; if ( mbInit == 0 ) @@ -184,7 +184,7 @@ long ZCodec::Decompress( SvStream& rIStm, SvStream& rOStm ) { if ( PZSTREAM->avail_out == 0 ) ImplWriteBack(); if ( PZSTREAM->avail_in == 0 && mnInToRead ) - { + { nInToRead = ( mnInBufSize > mnInToRead ) ? mnInToRead : mnInBufSize; PZSTREAM->avail_in = mpIStm->Read( PZSTREAM->next_in = mpInBuf, nInToRead ); mnInToRead -= nInToRead; @@ -199,36 +199,36 @@ long ZCodec::Decompress( SvStream& rIStm, SvStream& rOStm ) mbStatus = FALSE; break; } - - } + + } while ( ( err != Z_STREAM_END) && ( PZSTREAM->avail_in || mnInToRead ) ); ImplWriteBack(); - - if ( err == Z_STREAM_END ) - mbFinish = TRUE; + + if ( err == Z_STREAM_END ) + mbFinish = TRUE; return ( mbStatus ) ? (long)(PZSTREAM->total_out - nOldTotal_Out) : -1; } // ------------------------------------------------------------------------ long ZCodec::Write( SvStream& rOStm, const BYTE* pData, ULONG nSize ) -{ +{ if ( mbInit == 0 ) { mpOStm = &rOStm; ImplInitBuf( FALSE ); } - + PZSTREAM->avail_in = nSize; PZSTREAM->next_in = (unsigned char*)pData; - + while ( PZSTREAM->avail_in || ( PZSTREAM->avail_out == 0 ) ) { if ( PZSTREAM->avail_out == 0 ) ImplWriteBack(); if ( deflate( PZSTREAM, Z_NO_FLUSH ) < 0 ) - { + { mbStatus = FALSE; break; } @@ -241,10 +241,10 @@ long ZCodec::Write( SvStream& rOStm, const BYTE* pData, ULONG nSize ) long ZCodec::Read( SvStream& rIStm, BYTE* pData, ULONG nSize ) { int err; - ULONG nInToRead; + ULONG nInToRead; - if ( mbFinish ) - return 0; // PZSTREAM->total_out; + if ( mbFinish ) + return 0; // PZSTREAM->total_out; mpIStm = &rIStm; if ( mbInit == 0 ) @@ -277,7 +277,7 @@ long ZCodec::Read( SvStream& rIStm, BYTE* pData, ULONG nSize ) while ( (err != Z_STREAM_END) && (PZSTREAM->avail_out != 0) && (PZSTREAM->avail_in || mnInToRead) ); - if ( err == Z_STREAM_END ) + if ( err == Z_STREAM_END ) mbFinish = TRUE; return (mbStatus ? (long)(nSize - PZSTREAM->avail_out) : -1); @@ -288,10 +288,10 @@ long ZCodec::Read( SvStream& rIStm, BYTE* pData, ULONG nSize ) long ZCodec::ReadAsynchron( SvStream& rIStm, BYTE* pData, ULONG nSize ) { int err = 0; - ULONG nInToRead; + ULONG nInToRead; - if ( mbFinish ) - return 0; // PZSTREAM->total_out; + if ( mbFinish ) + return 0; // PZSTREAM->total_out; if ( mbInit == 0 ) { @@ -336,7 +336,7 @@ long ZCodec::ReadAsynchron( SvStream& rIStm, BYTE* pData, ULONG nSize ) while ( (err != Z_STREAM_END) && (PZSTREAM->avail_out != 0) && (PZSTREAM->avail_in || mnInToRead) ); - if ( err == Z_STREAM_END ) + if ( err == Z_STREAM_END ) mbFinish = TRUE; return (mbStatus ? (long)(nSize - PZSTREAM->avail_out) : -1); @@ -347,7 +347,7 @@ long ZCodec::ReadAsynchron( SvStream& rIStm, BYTE* pData, ULONG nSize ) void ZCodec::ImplWriteBack() { ULONG nAvail = mnOutBufSize - PZSTREAM->avail_out; - + if ( nAvail ) { if ( mbInit & 2 && ( mnCompressMethod & ZCODEC_UPDATE_CRC ) ) @@ -392,12 +392,12 @@ void ZCodec::ImplInitBuf ( BOOL nIOFlag ) if ( mbInit == 0 ) { if ( nIOFlag ) - { + { mbInit = 1; if ( mbStatus && ( mnCompressMethod & ZCODEC_GZ_LIB ) ) { BYTE n1, n2, j, nMethod, nFlags; - for ( int i = 0; i < 2; i++ ) // gz - magic number + for ( int i = 0; i < 2; i++ ) // gz - magic number { *mpIStm >> j; if ( j != gz_magic[ i ] ) @@ -423,7 +423,7 @@ void ZCodec::ImplInitBuf ( BOOL nIOFlag ) do { *mpIStm >> j; - } + } while ( j && !mpIStm->IsEof() ); } /* skip the .gz file comment */ @@ -436,7 +436,7 @@ void ZCodec::ImplInitBuf ( BOOL nIOFlag ) while ( j && !mpIStm->IsEof() ); } /* skip the header crc */ - if ( nFlags & GZ_HEAD_CRC ) + if ( nFlags & GZ_HEAD_CRC ) mpIStm->SeekRel( 2 ); if ( mbStatus ) mbStatus = ( inflateInit2( PZSTREAM, -MAX_WBITS) != Z_OK ) ? FALSE : TRUE; @@ -448,11 +448,11 @@ void ZCodec::ImplInitBuf ( BOOL nIOFlag ) mpInBuf = new BYTE[ mnInBufSize ]; } else - { + { mbInit = 3; - mbStatus = ( deflateInit2_( PZSTREAM, mnCompressMethod & 0xff, Z_DEFLATED, - MAX_WBITS, mnMemUsage, ( mnCompressMethod >> 8 ) & 0xff, + mbStatus = ( deflateInit2_( PZSTREAM, mnCompressMethod & 0xff, Z_DEFLATED, + MAX_WBITS, mnMemUsage, ( mnCompressMethod >> 8 ) & 0xff, ZLIB_VERSION, sizeof( z_stream ) ) >= 0 ); PZSTREAM->next_out = mpOutBuf = new BYTE[ PZSTREAM->avail_out = mnOutBufSize ]; diff --git a/tools/test/export.map b/tools/test/export.map index f313c44bd7ad..7321bbca16ad 100644 --- a/tools/test/export.map +++ b/tools/test/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/tools/test/tests.cxx b/tools/test/tests.cxx index 077e0ba966d9..5a1e21f172a4 100644 --- a/tools/test/tests.cxx +++ b/tools/test/tests.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/unx/source/dll/toolsdll.cxx b/tools/unx/source/dll/toolsdll.cxx index e7f2baa5360d..71b01e20bd4f 100644 --- a/tools/unx/source/dll/toolsdll.cxx +++ b/tools/unx/source/dll/toolsdll.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/win/inc/dll.hxx b/tools/win/inc/dll.hxx index 25e1e55278e8..2a91aefc0fa9 100644 --- a/tools/win/inc/dll.hxx +++ b/tools/win/inc/dll.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/win/inc/parser.hxx b/tools/win/inc/parser.hxx index e4d42632060a..08b0d7968d54 100644 --- a/tools/win/inc/parser.hxx +++ b/tools/win/inc/parser.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ String GetURLFromHostNotation( const String & rPath ); String GetHostNotationFromURL( const String & rURL ); CItemIDList MakeIDToken( const String &rToken ); -CItemIDList ParseSpecialURL( const String & rURL ); +CItemIDList ParseSpecialURL( const String & rURL ); #endif diff --git a/tools/win/inc/shellex.h b/tools/win/inc/shellex.h index e6371527e9b4..f81502a3382b 100644 --- a/tools/win/inc/shellex.h +++ b/tools/win/inc/shellex.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,54 +31,54 @@ #include <shlobj.h> #endif -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { -#define WINSHELLCALL inline +#define WINSHELLCALL inline #else -#define WINSHELLCALL static +#define WINSHELLCALL static #endif -#define SHChangeNotifyRegister_PROC_STR MAKEINTRESOURCE(2) -#define SHChangeNotifyDeregister_PROC_STR MAKEINTRESOURCE(4) +#define SHChangeNotifyRegister_PROC_STR MAKEINTRESOURCE(2) +#define SHChangeNotifyDeregister_PROC_STR MAKEINTRESOURCE(4) -#define SHCNF_ACCEPT_INTERRUPTS 0x0001 -#define SHCNF_ACCEPT_NON_INTERRUPTS 0x0002 -#define SHCNF_NO_PROXY 0x8000 +#define SHCNF_ACCEPT_INTERRUPTS 0x0001 +#define SHCNF_ACCEPT_NON_INTERRUPTS 0x0002 +#define SHCNF_NO_PROXY 0x8000 -#define SHCNF_ACCEPT_ALL (SHCNF_ACCEPT_INTERRUPTS | SHCNF_ACCEPT_NON_INTERRUPTS) +#define SHCNF_ACCEPT_ALL (SHCNF_ACCEPT_INTERRUPTS | SHCNF_ACCEPT_NON_INTERRUPTS) typedef struct tagNOTIFYREGISTER { - LPCITEMIDLIST pidlPath; - BOOL bWatchSubtree; + LPCITEMIDLIST pidlPath; + BOOL bWatchSubtree; } NOTIFYREGISTER; typedef NOTIFYREGISTER *LPNOTIFYREGISTER; typedef NOTIFYREGISTER const *LPCNOTIFYREGISTER; typedef HANDLE (WINAPI *SHChangeNotifyRegister_PROC)( - HWND hWnd, - DWORD dwFlags, - LONG wEventMask, - UINT uMsg, - ULONG cItems, - LPCNOTIFYREGISTER lpItems); + HWND hWnd, + DWORD dwFlags, + LONG wEventMask, + UINT uMsg, + ULONG cItems, + LPCNOTIFYREGISTER lpItems); WINSHELLCALL HANDLE WINAPI SHChangeNotifyRegister( - HWND hWnd, - DWORD dwFlags, - LONG wEventMask, - UINT uMsg, - ULONG cItems, - LPCNOTIFYREGISTER lpItems) + HWND hWnd, + DWORD dwFlags, + LONG wEventMask, + UINT uMsg, + ULONG cItems, + LPCNOTIFYREGISTER lpItems) { - HMODULE hModule = GetModuleHandle( "SHELL32" ); - HANDLE hNotify = NULL; + HMODULE hModule = GetModuleHandle( "SHELL32" ); + HANDLE hNotify = NULL; if ( hModule ) { - SHChangeNotifyRegister_PROC lpfnSHChangeNotifyRegister = (SHChangeNotifyRegister_PROC)GetProcAddress( hModule, SHChangeNotifyRegister_PROC_STR ); + SHChangeNotifyRegister_PROC lpfnSHChangeNotifyRegister = (SHChangeNotifyRegister_PROC)GetProcAddress( hModule, SHChangeNotifyRegister_PROC_STR ); if ( lpfnSHChangeNotifyRegister ) hNotify = lpfnSHChangeNotifyRegister( hWnd, dwFlags, wEventMask, uMsg, cItems, lpItems ); } @@ -89,16 +89,16 @@ WINSHELLCALL HANDLE WINAPI SHChangeNotifyRegister( typedef BOOL (WINAPI *SHChangeNotifyDeregister_PROC)( - HANDLE hNotify); + HANDLE hNotify); WINSHELLCALL BOOL WINAPI SHChangeNotifyDeregister( HANDLE hNotify ) { - HMODULE hModule = GetModuleHandle( "SHELL32" ); - BOOL fSuccess = FALSE; + HMODULE hModule = GetModuleHandle( "SHELL32" ); + BOOL fSuccess = FALSE; if ( hModule ) { - SHChangeNotifyDeregister_PROC lpfnSHChangeNotifyDeregister = (SHChangeNotifyDeregister_PROC)GetProcAddress( hModule, SHChangeNotifyDeregister_PROC_STR ); + SHChangeNotifyDeregister_PROC lpfnSHChangeNotifyDeregister = (SHChangeNotifyDeregister_PROC)GetProcAddress( hModule, SHChangeNotifyDeregister_PROC_STR ); if ( lpfnSHChangeNotifyDeregister ) fSuccess = lpfnSHChangeNotifyDeregister( hNotify ); } @@ -107,7 +107,7 @@ WINSHELLCALL BOOL WINAPI SHChangeNotifyDeregister( HANDLE hNotify ) } -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/tools/win/inc/shutil.h b/tools/win/inc/shutil.h index d9e56ccf7584..1daae442292d 100644 --- a/tools/win/inc/shutil.h +++ b/tools/win/inc/shutil.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,38 +38,38 @@ extern "C" { #endif -#define PROTOCOL_FILE "file:" -#define MAX_URL (MAX_PATH + sizeof(PROTOCOL_FILE)) +#define PROTOCOL_FILE "file:" +#define MAX_URL (MAX_PATH + sizeof(PROTOCOL_FILE)) #define SHUTIL_TO_DELIVER //-------------------------------------------------------------------------- -void * WINAPI WIN_SHAlloc( ULONG cb ); -void * WINAPI WIN_SHRealloc( void *pv, ULONG cb ); -void WINAPI WIN_SHFree( void *pv ); +void * WINAPI WIN_SHAlloc( ULONG cb ); +void * WINAPI WIN_SHRealloc( void *pv, ULONG cb ); +void WINAPI WIN_SHFree( void *pv ); //-------------------------------------------------------------------------- -ULONG WINAPI WIN_SHGetIDListSize( LPCITEMIDLIST pidl ); -BOOL WINAPI WIN_SHCloneIDList( LPCITEMIDLIST pidl, LPITEMIDLIST *ppidl ); -BOOL WINAPI WIN_SHAppendIDList( LPCITEMIDLIST pidl, LPITEMIDLIST *ppidl ); -LONG WINAPI WIN_SHCompareIDList( LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2 ); +ULONG WINAPI WIN_SHGetIDListSize( LPCITEMIDLIST pidl ); +BOOL WINAPI WIN_SHCloneIDList( LPCITEMIDLIST pidl, LPITEMIDLIST *ppidl ); +BOOL WINAPI WIN_SHAppendIDList( LPCITEMIDLIST pidl, LPITEMIDLIST *ppidl ); +LONG WINAPI WIN_SHCompareIDList( LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2 ); -LONG WINAPI WIN_SHGetIDListTokenCount( LPCITEMIDLIST pidl ); -BOOL WINAPI WIN_SHGetIDListToken( LPCITEMIDLIST pidl, ULONG nToken, LPITEMIDLIST *ppidl ); +LONG WINAPI WIN_SHGetIDListTokenCount( LPCITEMIDLIST pidl ); +BOOL WINAPI WIN_SHGetIDListToken( LPCITEMIDLIST pidl, ULONG nToken, LPITEMIDLIST *ppidl ); -BOOL WINAPI WIN_SHSplitIDList( - LPCITEMIDLIST pidl, - LPITEMIDLIST * pidlFolder, - LPITEMIDLIST * pidlItem +BOOL WINAPI WIN_SHSplitIDList( + LPCITEMIDLIST pidl, + LPITEMIDLIST * pidlFolder, + LPITEMIDLIST * pidlItem ); -BOOL WINAPI WIN_SHSplitIDListEx( - LPCITEMIDLIST pidl, - LPITEMIDLIST * pidlParent, - LPITEMIDLIST * pidlChild, - ULONG nLevel +BOOL WINAPI WIN_SHSplitIDListEx( + LPCITEMIDLIST pidl, + LPITEMIDLIST * pidlParent, + LPITEMIDLIST * pidlChild, + ULONG nLevel ); //-------------------------------------------------------------------------- @@ -80,22 +80,22 @@ BOOL WINAPI WIN_SHSplitIDListEx( #define WIN_SHGetPathFromIDList( pidl, pszPath ) \ SHGetPathFromIDList( pidl, pszPath ) -// #define SHGP_CLSID 0x00000001 +// #define SHGP_CLSID 0x00000001 -// BOOL WINAPI WIN_SHGetPathFromIDListEx( LPCITEMIDLIST pidl, LPSTR pszBuffer, UINT uFlags ); +// BOOL WINAPI WIN_SHGetPathFromIDListEx( LPCITEMIDLIST pidl, LPSTR pszBuffer, UINT uFlags ); -BOOL WINAPI WIN_SHGetIDListFromPath( LPCSTR pszPath, LPITEMIDLIST *ppidl ); +BOOL WINAPI WIN_SHGetIDListFromPath( LPCSTR pszPath, LPITEMIDLIST *ppidl ); -BOOL WINAPI WIN_SHGetPathFromURL( LPCSTR pszURL, LPSTR pszPath ); -BOOL WINAPI WIN_SHGetURLFromPath( LPCSTR pszPath, LPSTR pszURL ); +BOOL WINAPI WIN_SHGetPathFromURL( LPCSTR pszURL, LPSTR pszPath ); +BOOL WINAPI WIN_SHGetURLFromPath( LPCSTR pszPath, LPSTR pszURL ); -BOOL WINAPI WIN_SHGetFolderFromIDList( LPCITEMIDLIST pidl, LPSHELLFOLDER *ppshf ); -BOOL WINAPI WIN_SHGetSpecialFolder( int nFolder, LPSHELLFOLDER *ppshf ); -BOOL WINAPI WIN_SHGetFolderFromPath( LPCSTR pszPath, LPSHELLFOLDER *ppshf ); +BOOL WINAPI WIN_SHGetFolderFromIDList( LPCITEMIDLIST pidl, LPSHELLFOLDER *ppshf ); +BOOL WINAPI WIN_SHGetSpecialFolder( int nFolder, LPSHELLFOLDER *ppshf ); +BOOL WINAPI WIN_SHGetFolderFromPath( LPCSTR pszPath, LPSHELLFOLDER *ppshf ); -BOOL WINAPI WIN_SHGetSpecialFolderPath( int nFolder, LPSTR pszPath ); +BOOL WINAPI WIN_SHGetSpecialFolderPath( int nFolder, LPSTR pszPath ); -HRESULT WINAPI WIN_SHGetDataFromIDList( +HRESULT WINAPI WIN_SHGetDataFromIDList( LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int nFormat, @@ -106,53 +106,53 @@ HRESULT WINAPI WIN_SHGetDataFromIDList( //-------------------------------------------------------------------------- -#define SHIC_PIDL 0x00000001 -#define SHIC_NO_UI 0x00000002 +#define SHIC_PIDL 0x00000001 +#define SHIC_NO_UI 0x00000002 -#define CMDSTR_OPENA "open" -#define CMDSTR_EXPLOREA "explore" -#define CMDSTR_FINDA "find" +#define CMDSTR_OPENA "open" +#define CMDSTR_EXPLOREA "explore" +#define CMDSTR_FINDA "find" -#define CMDSTR_OPENW L"open" -#define CMDSTR_EXPLOREW L"explore" -#define CMDSTR_FINDW L"find" +#define CMDSTR_OPENW L"open" +#define CMDSTR_EXPLOREW L"explore" +#define CMDSTR_FINDW L"find" #ifdef UNICODE -#define CMDSTR_OPEN CMDSTR_OPENW -#define CMDSTR_EXPLORE CMDSTR_EXPLOREW -#define CMDSTR_FIND CMDSTR_FINDW +#define CMDSTR_OPEN CMDSTR_OPENW +#define CMDSTR_EXPLORE CMDSTR_EXPLOREW +#define CMDSTR_FIND CMDSTR_FINDW #else -#define CMDSTR_OPEN CMDSTR_OPENA -#define CMDSTR_EXPLORE CMDSTR_EXPLOREA -#define CMDSTR_FIND CMDSTR_FINDA +#define CMDSTR_OPEN CMDSTR_OPENA +#define CMDSTR_EXPLORE CMDSTR_EXPLOREA +#define CMDSTR_FIND CMDSTR_FINDA #endif -#define CMDSTR_DEFAULT MAKEINTRESOURCE(0x00) +#define CMDSTR_DEFAULT MAKEINTRESOURCE(0x00) -#define CMDSTR_LINK MAKEINTRESOURCE(0x10) -#define CMDSTR_DELETE MAKEINTRESOURCE(0x11) -#define CMDSTR_RENAME MAKEINTRESOURCE(0x12) -#define CMDSTR_PROPERTIES MAKEINTRESOURCE(0x13) -#define CMDSTR_CUT MAKEINTRESOURCE(0x18) -#define CMDSTR_COPY MAKEINTRESOURCE(0x19) +#define CMDSTR_LINK MAKEINTRESOURCE(0x10) +#define CMDSTR_DELETE MAKEINTRESOURCE(0x11) +#define CMDSTR_RENAME MAKEINTRESOURCE(0x12) +#define CMDSTR_PROPERTIES MAKEINTRESOURCE(0x13) +#define CMDSTR_CUT MAKEINTRESOURCE(0x18) +#define CMDSTR_COPY MAKEINTRESOURCE(0x19) BOOL WINAPI WIN_SHInvokeCommand( - HWND hwndOwner, - DWORD dwFlags, - LPCTSTR lpPath, - LPCSTR lpVerb, - LPCSTR lpParameters, - LPCSTR lpDirectory, - int nShow + HWND hwndOwner, + DWORD dwFlags, + LPCTSTR lpPath, + LPCSTR lpVerb, + LPCSTR lpParameters, + LPCSTR lpDirectory, + int nShow ); //-------------------------------------------------------------------------- BOOL WINAPI WIN_SHStrRetToMultiByte( - LPCITEMIDLIST pidl, - const STRRET * pStr, - LPSTR lpMultiByte, - int cchMultiByte + LPCITEMIDLIST pidl, + const STRRET * pStr, + LPSTR lpMultiByte, + int cchMultiByte ); DWORD WIN_SHBuildCRC( LPVOID pBytes, ULONG nBytes ); @@ -166,43 +166,43 @@ HIMAGELIST WINAPI WIN_SHGetSystemImageList( UINT uFlags ); /* ULONG WINAPI WIN_CreateStringFromBinary ( - LPCVOID pv, - ULONG cbSize, - LPSTR pszString, - ULONG cbStringSize + LPCVOID pv, + ULONG cbSize, + LPSTR pszString, + ULONG cbStringSize ); ULONG WINAPI WIN_CreateBinaryFromString( - LPCSTR pszStr, - LPVOID pBuffer, - ULONG cbSize + LPCSTR pszStr, + LPVOID pBuffer, + ULONG cbSize ); */ //-------------------------------------------------------------------------- -DWORD WINAPI WIN_SHSetValue( - HKEY hKey, - LPCTSTR pszSubKey, - LPCTSTR pszValue, - DWORD dwType, - LPCVOID pvData, - DWORD cbData +DWORD WINAPI WIN_SHSetValue( + HKEY hKey, + LPCTSTR pszSubKey, + LPCTSTR pszValue, + DWORD dwType, + LPCVOID pvData, + DWORD cbData ); -DWORD WINAPI WIN_SHGetValue( - HKEY hKey, - LPCTSTR pszSubKey, - LPCTSTR pszValue, - LPDWORD pdwType, - LPVOID pvData, - LPDWORD pcbData +DWORD WINAPI WIN_SHGetValue( + HKEY hKey, + LPCTSTR pszSubKey, + LPCTSTR pszValue, + LPDWORD pdwType, + LPVOID pvData, + LPDWORD pcbData ); DWORD WINAPI WIN_SHDeleteValue( - HKEY hKey, - LPCTSTR pszSubKey, - LPCTSTR pszValue + HKEY hKey, + LPCTSTR pszSubKey, + LPCTSTR pszValue ); #ifdef __cplusplus @@ -211,5 +211,5 @@ DWORD WINAPI WIN_SHDeleteValue( #endif -#endif // _SHUTIL_H_ +#endif // _SHUTIL_H_ diff --git a/tools/win/inc/toolsdll.hxx b/tools/win/inc/toolsdll.hxx index 1e8671e628ed..a6b1546763bc 100644 --- a/tools/win/inc/toolsdll.hxx +++ b/tools/win/inc/toolsdll.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/win/inc/winshell.hxx b/tools/win/inc/winshell.hxx index a09db9f39b38..a8be1e7d1344 100644 --- a/tools/win/inc/winshell.hxx +++ b/tools/win/inc/winshell.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,14 +79,14 @@ public: { return m_nFolder; } protected: - ITEMIDLIST *m_pidl; - int m_nFolder; + ITEMIDLIST *m_pidl; + int m_nFolder; }; inline CItemIDList CItemIDList::operator + ( const CItemIDList & rIDList ) const { - CItemIDList aCopy( *this ); + CItemIDList aCopy( *this ); aCopy += rIDList; return aCopy; } @@ -108,81 +108,81 @@ enum NotificationEvent typedef struct _WIN32_VOLUME_DATA { - TCHAR cDeviceName[MAX_PATH]; - TCHAR cVolumeName[MAX_PATH]; - TCHAR cFileSystemName[MAX_PATH]; - DWORD dwSerialNumber; - DWORD dwFileSystemFlags; - DWORD nMaxComponentLength; + TCHAR cDeviceName[MAX_PATH]; + TCHAR cVolumeName[MAX_PATH]; + TCHAR cFileSystemName[MAX_PATH]; + DWORD dwSerialNumber; + DWORD dwFileSystemFlags; + DWORD nMaxComponentLength; } WIN32_VOLUME_DATA; // Bekannte Class-IDs fuer wichtige Ordner -// {871C5380-42A0-1069-A2EA-08002B30309D} Internet Explorer 4.0 -static const GUID CLSID_IE4 = +// {871C5380-42A0-1069-A2EA-08002B30309D} Internet Explorer 4.0 +static const GUID CLSID_IE4 = { 0x871C5380, 0x42A0, 0x1069, { 0xA2, 0xEA, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D } }; -// {208D2C60-3AEA-1069-A2D7-08002B30309D} Netzwerkumgebung -static const GUID CLSID_Network = +// {208D2C60-3AEA-1069-A2D7-08002B30309D} Netzwerkumgebung +static const GUID CLSID_Network = { 0x208D2C60, 0x3AEA, 0x1069, { 0xA2, 0xD7, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D } }; -// {645FF040-5081-101B-9F08-00AA002F954E} Papierkorb -static const GUID CLSID_RecycleBin = +// {645FF040-5081-101B-9F08-00AA002F954E} Papierkorb +static const GUID CLSID_RecycleBin = { 0x645FF040, 0x5081, 0x101B, { 0x9F, 0x08, 0x00, 0xAA, 0x00, 0x2F, 0x95, 0x4E } }; -// {20D04FE0-3AEA-1069-A2D8-08002B30309D} Arbeitsplatz -static const GUID CLSID_MyComputer = +// {20D04FE0-3AEA-1069-A2D8-08002B30309D} Arbeitsplatz +static const GUID CLSID_MyComputer = { 0x20D04FE0, 0x3AEA, 0x1069, { 0xA2, 0xD8, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D } }; -// {D6277990-4C6A-11CF-8D87-00AA0060F5BF} Geplante Vorgänge -static const GUID CLSID_Tasks = +// {D6277990-4C6A-11CF-8D87-00AA0060F5BF} Geplante Vorgänge +static const GUID CLSID_Tasks = { 0xD6277990, 0x4C6A, 0x11CF, { 0x8D, 0x87, 0x00, 0xAA, 0x00, 0x60, 0xF5, 0xBF } }; // Fehlt im Header -#define SHGDN_INCLUDE_NONFILESYS 0x2000 +#define SHGDN_INCLUDE_NONFILESYS 0x2000 -#define CSIDL_UNKNOWN -1 -#define CSIDL_ROOT -2 -#define CSIDL_SYSTEM -3 +#define CSIDL_UNKNOWN -1 +#define CSIDL_ROOT -2 +#define CSIDL_SYSTEM -3 // Suchmaske fuer IEnumIDList -#define SHCONTF_ALL (SHCONTF_FOLDERS | SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN) +#define SHCONTF_ALL (SHCONTF_FOLDERS | SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN) // SHITEM Prefix Kinds -#define SHGII_CONTAINER_MASK 0x70 +#define SHGII_CONTAINER_MASK 0x70 -#define SHGII_COMPUTER 0x20 +#define SHGII_COMPUTER 0x20 -#define SHGII_COMPUTER_REMOVABLE 0x22 -#define SHGII_COMPUTER_FIXED 0x23 -#define SHGII_COMPUTER_REMOTE 0x24 -#define SHGII_COMPUTER_CDROM 0x25 -#define SHGII_COMPUTER_RAMDISK 0x26 -#define SHGII_COMPUTER_FLOPPY525 0x28 -#define SHGII_COMPUTER_FLOPPY35 0x29 -#define SHGII_COMPUTER_NETWORK 0x2A -#define SHGII_COMPUTER_REGITEM 0x2E +#define SHGII_COMPUTER_REMOVABLE 0x22 +#define SHGII_COMPUTER_FIXED 0x23 +#define SHGII_COMPUTER_REMOTE 0x24 +#define SHGII_COMPUTER_CDROM 0x25 +#define SHGII_COMPUTER_RAMDISK 0x26 +#define SHGII_COMPUTER_FLOPPY525 0x28 +#define SHGII_COMPUTER_FLOPPY35 0x29 +#define SHGII_COMPUTER_NETWORK 0x2A +#define SHGII_COMPUTER_REGITEM 0x2E -#define SHGII_ROOT 0x10 -#define SHGII_ROOT_REGITEM 0x1F +#define SHGII_ROOT 0x10 +#define SHGII_ROOT_REGITEM 0x1F -#define SHGII_NETWORK 0x40 -#define SHGII_NETWORK_TREE 0x47 -#define SHGII_NETWORK_SERVER 0x42 -#define SHGII_NETWORK_DIRECTORY 0x43 -#define SHGII_NETWORK_PRINTER 0x41 +#define SHGII_NETWORK 0x40 +#define SHGII_NETWORK_TREE 0x47 +#define SHGII_NETWORK_SERVER 0x42 +#define SHGII_NETWORK_DIRECTORY 0x43 +#define SHGII_NETWORK_PRINTER 0x41 -#define SHGII_FILESYSTEM 0x30 -#define SHGII_FILESYSTEM_FILE 0x31 -#define SHGII_FILESYSTEM_DIRECTORY 0x32 +#define SHGII_FILESYSTEM 0x30 +#define SHGII_FILESYSTEM_FILE 0x31 +#define SHGII_FILESYSTEM_DIRECTORY 0x32 -#define SHGII_ANCESTOR 0x80 +#define SHGII_ANCESTOR 0x80 -#define SHITEMCONTAINER( pidl ) ((pidl)->mkid.abID[0] & SHGII_CONTAINER_MASK) -#define SHITEMKIND( pidl ) ((pidl)->mkid.abID[0] & 0x7F) +#define SHITEMCONTAINER( pidl ) ((pidl)->mkid.abID[0] & SHGII_CONTAINER_MASK) +#define SHITEMKIND( pidl ) ((pidl)->mkid.abID[0] & 0x7F) //---------------------------------------------------------------------------- // CShellFolderData @@ -194,12 +194,12 @@ protected: CShellFolderData(); virtual ~CShellFolderData(); - IShellFolder *m_pShellFolder; - IEnumIDList *m_pEnumIDList; - IShellIcon *m_pShellIcon; - BOOL m_bIsOpen; - HANDLE m_hCancelEvent; - DWORD m_dwContentFlags; + IShellFolder *m_pShellFolder; + IEnumIDList *m_pEnumIDList; + IShellIcon *m_pShellIcon; + BOOL m_bIsOpen; + HANDLE m_hCancelEvent; + DWORD m_dwContentFlags; }; //---------------------------------------------------------------------------- @@ -233,7 +233,7 @@ public: virtual BOOL GetVolumeInfo( const CItemIDList & rIDList, WIN32_VOLUME_DATA * ); // Modifying the folder contents - + virtual BOOL SetNameOf( const CItemIDList &, const String &, CItemIDList & ); virtual BOOL DeleteItem( const CItemIDList & ); @@ -276,7 +276,7 @@ protected: void Initialize( LPCTSTR pszPath ); - TCHAR m_szPath[MAX_PATH]; + TCHAR m_szPath[MAX_PATH]; }; //---------------------------------------------------------------------------- @@ -295,7 +295,7 @@ protected: void Initialize( int nFolder ); - int m_nFolder; + int m_nFolder; }; //---------------------------------------------------------------------------- diff --git a/tools/win/source/dll/toolsdll.cxx b/tools/win/source/dll/toolsdll.cxx index fd73adacd72b..8fc9888021bb 100644 --- a/tools/win/source/dll/toolsdll.cxx +++ b/tools/win/source/dll/toolsdll.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/workben/fstest.cxx b/tools/workben/fstest.cxx index 2d33516840af..8048f2c166b0 100644 --- a/tools/workben/fstest.cxx +++ b/tools/workben/fstest.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,4 +91,4 @@ void CheckTimes(DirEntry aDE) aDateModified.GetDate(), aTimeModified.GetTime()); return; } - + diff --git a/tools/workben/hashtbl.cxx b/tools/workben/hashtbl.cxx index 26b5535904ea..bcd9f903ab64 100644 --- a/tools/workben/hashtbl.cxx +++ b/tools/workben/hashtbl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,12 +33,12 @@ #include <algorithm> -// ------------------------------------------------------------- +// ------------------------------------------------------------- // class HashItem // class HashItem { - enum ETag { TAG_EMPTY, TAG_USED, TAG_DELETED }; + enum ETag { TAG_EMPTY, TAG_USED, TAG_DELETED }; void* m_pObject; ETag m_Tag; @@ -49,13 +49,13 @@ public: BOOL IsDeleted() const { return m_Tag == TAG_DELETED; } - + BOOL IsEmpty() const - { return m_Tag == TAG_DELETED || m_Tag == TAG_EMPTY; } + { return m_Tag == TAG_DELETED || m_Tag == TAG_EMPTY; } BOOL IsFree() const { return m_Tag == TAG_EMPTY; } - + BOOL IsUsed() const { return m_Tag == TAG_USED; } @@ -75,7 +75,7 @@ public: // #define MIN(a,b) (a)<(b)?(a):(b) // #define MAX(a,b) (a)>(b)?(a):(b) -// ------------------------------------------------------------- +// ------------------------------------------------------------- // class HashTable // @@ -88,14 +88,14 @@ HashTable::HashTable(ULONG lSize, BOOL bOwner, double dMaxLoadFactor, double dGr m_bOwner = bOwner; m_lElem = 0; m_dMaxLoadFactor = std::max(0.5,std::min(1.0,dMaxLoadFactor)); // 0.5 ... 1.0 - m_dGrowFactor = std::max(1.3,(5.0,dGrowFactor)); // 1.3 ... 5.0 + m_dGrowFactor = std::max(1.3,(5.0,dGrowFactor)); // 1.3 ... 5.0 m_pData = new HashItem [lSize]; // Statistik #ifdef DBG_UTIL m_aStatistic.m_lSingleHash = 0; m_aStatistic.m_lDoubleHash = 0; - m_aStatistic.m_lProbe = 0; + m_aStatistic.m_lProbe = 0; #endif } @@ -129,7 +129,7 @@ void* HashTable::GetObjectAt(ULONG lPos) const // Gibt Objekt zurück, wenn es eines gibt, sonst NULL; { DBG_ASSERT(lPos<m_lSize, "HashTable::GetObjectAt()"); - + HashItem *pItem = &m_pData[lPos]; return pItem->IsUsed() ? pItem->GetObject() : NULL; @@ -145,9 +145,9 @@ ULONG HashTable::Hash(String const& Key) const /* ULONG lHash = 0; ULONG i,n; - + for (i=0,n=Key.Len(); i<n; i++) - { + { lHash *= 256L; lHash += (ULONG)(USHORT)Key.GetStr()[i]; lHash %= m_lSize; @@ -160,7 +160,7 @@ ULONG HashTable::Hash(String const& Key) const ULONG i,n; ULONG h = 0; ULONG g = 0; - + for (i=0,n=Key.Len(); i<n; i++) { h = (h<<4) + (ULONG)(USHORT)Key.GetStr()[i]; @@ -174,28 +174,28 @@ ULONG HashTable::Hash(String const& Key) const } return h % m_lSize; -} +} ULONG HashTable::DHash(String const& Key, ULONG lOldHash) const { ULONG lHash = lOldHash; ULONG i,n; - + for (i=0,n=Key.Len(); i<n; i++) - { + { lHash *= 256L; lHash += (ULONG)(USHORT)Key.GetStr()[i]; lHash %= m_lSize; } return lHash; -/* return +/* return ( lHash - + (char)Key.GetStr()[0] * 256 - + (char)Key.GetStr()[Key.Len()-1] - + 1 - ) + + (char)Key.GetStr()[0] * 256 + + (char)Key.GetStr()[Key.Len()-1] + + 1 + ) % m_lSize; */ } @@ -206,10 +206,10 @@ ULONG HashTable::Probe(ULONG lPos) const lPos++; if (lPos==m_lSize) lPos=0; return lPos; } - + BOOL HashTable::IsFull() const -{ - return m_lElem>=m_lSize; +{ + return m_lElem>=m_lSize; } BOOL HashTable::Insert(String const& Key, void* pObject) @@ -234,7 +234,7 @@ BOOL HashTable::Insert(String const& Key, void* pObject) // first hashing // if (pItem->IsEmpty()) - { + { pItem->SetObject(Key, pObject); m_lElem++; @@ -243,13 +243,13 @@ BOOL HashTable::Insert(String const& Key, void* pObject) #endif return TRUE; - } - + } + // double hashing // lPos = DHash(Key,lPos); pItem = &m_pData[lPos]; - + if (pItem->IsEmpty()) { pItem->SetObject(Key, pObject); @@ -263,7 +263,7 @@ BOOL HashTable::Insert(String const& Key, void* pObject) } // linear probing - // + // do { #ifdef DBG_UTIL @@ -291,55 +291,55 @@ HashItem* HashTable::FindPos(String const& Key) const // ULONG lPos = Hash(Key); HashItem *pItem = &m_pData[lPos]; - + if (pItem->IsUsed() && pItem->GetKey() == Key) { return pItem; - } - + } + // double hashing // if (pItem->IsDeleted() || pItem->IsUsed()) { lPos = DHash(Key,lPos); pItem = &m_pData[lPos]; - + if (pItem->IsUsed() && pItem->GetKey() == Key) { return pItem; - } + } // linear probing - // + // if (pItem->IsDeleted() || pItem->IsUsed()) - { + { ULONG n = 0; BOOL bFound = FALSE; BOOL bEnd = FALSE; - + do - { + { n++; lPos = Probe(lPos); pItem = &m_pData[lPos]; - bFound = pItem->IsUsed() + bFound = pItem->IsUsed() && pItem->GetKey() == Key; - - bEnd = !(n<m_lSize || pItem->IsFree()); + + bEnd = !(n<m_lSize || pItem->IsFree()); } while(!bFound && !bEnd); - - return bFound ? pItem : NULL; + + return bFound ? pItem : NULL; } - } + } // nicht gefunden // return NULL; -} +} void* HashTable::Find(String const& Key) const // Gibt Verweis des Objektes zurück, das unter Key abgespeichert ist, @@ -347,9 +347,9 @@ void* HashTable::Find(String const& Key) const // // pre: - // post: - -{ +{ HashItem *pItem = FindPos(Key); - + if (pItem != NULL && pItem->GetKey() == Key) return pItem->GetObject(); @@ -367,7 +367,7 @@ void* HashTable::Delete(String const& Key) // Wenn die HashTable der Owner ist, wurde das Object gelöscht { HashItem *pItem = FindPos(Key); - + if (pItem != NULL && pItem->GetKey() == Key) { @@ -399,10 +399,10 @@ void HashTable::SmartGrow() double dLoadFactor = CalcLoadFactor(); if (dLoadFactor <= m_dMaxLoadFactor) - return; // nothing to grow + return; // nothing to grow ULONG lOldSize = m_lSize; // alte Daten sichern - HashItem* pOldData = m_pData; + HashItem* pOldData = m_pData; m_lSize = ULONG (m_dGrowFactor * m_lSize); // neue Größe m_pData = new HashItem[m_lSize]; // neue Daten holen @@ -417,7 +417,7 @@ void HashTable::SmartGrow() return; } - m_lElem = 0; // noch keine neuen Daten + m_lElem = 0; // noch keine neuen Daten // Umkopieren der Daten // @@ -471,26 +471,26 @@ void* HashTableIterator::GetPrev() return FindValidObject(FALSE /* backward */); } -void* HashTableIterator::FindValidObject(BOOL bForward) +void* HashTableIterator::FindValidObject(BOOL bForward) // Sucht nach einem vorhandenen Objekt ab der aktuellen // Position. // // pre: ab inkl. m_lAt soll die Suche beginnen // post: if not found then -// if bForward == TRUE then -// m_lAt == m_aTable.GetSize() -1 -// else -// m_lAt == 0 -// else -// m_lAt ist die gefundene Position +// if bForward == TRUE then +// m_lAt == m_aTable.GetSize() -1 +// else +// m_lAt == 0 +// else +// m_lAt ist die gefundene Position { void *pObject = m_aTable.GetObjectAt(m_lAt); if (pObject != NULL) return pObject; - + while (pObject == NULL - && (bForward ? ((m_lAt+1) < m_aTable.GetSize()) + && (bForward ? ((m_lAt+1) < m_aTable.GetSize()) : m_lAt > 0)) { if (bForward) @@ -499,7 +499,7 @@ void* HashTableIterator::FindValidObject(BOOL bForward) m_lAt--; pObject = m_aTable.GetObjectAt(m_lAt); - } + } #ifdef DBG_UTIL @@ -511,5 +511,5 @@ void* HashTableIterator::FindValidObject(BOOL bForward) #endif - return pObject; + return pObject; } diff --git a/tools/workben/hashtbl.hxx b/tools/workben/hashtbl.hxx index 60b78afe5205..f4593b8148cf 100644 --- a/tools/workben/hashtbl.hxx +++ b/tools/workben/hashtbl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,8 +31,8 @@ #include <tlgen.hxx> // ADT hash table -// -// Invariante: +// +// Invariante: // 1. m_lElem < m_lSize // 2. die Elemente in m_Array wurden double-hashed erzeugt // @@ -46,24 +46,24 @@ class HashTable double m_dMaxLoadFactor; double m_dGrowFactor; BOOL m_bOwner; - + ULONG Hash(String const& Key) const; - ULONG DHash(String const& Key, ULONG lHash) const; + ULONG DHash(String const& Key, ULONG lHash) const; ULONG Probe(ULONG lPos) const; - - HashItem* FindPos(String const& Key) const; + + HashItem* FindPos(String const& Key) const; void SmartGrow(); double CalcLoadFactor() const; // Statistik #ifdef DBG_UTIL -private: +private: struct { ULONG m_lSingleHash; ULONG m_lDoubleHash; ULONG m_lProbe; - } + } m_aStatistic; #endif @@ -75,36 +75,36 @@ protected: void* GetObjectAt(ULONG lPos) const; // Default-Werte -public: +public: static double m_defMaxLoadFactor; static double m_defDefGrowFactor; public: HashTable ( - ULONG lSize, - BOOL bOwner, - double dMaxLoadFactor = HashTable::m_defMaxLoadFactor /* 0.8 */, - double dGrowFactor = HashTable::m_defDefGrowFactor /* 2.0 */ + ULONG lSize, + BOOL bOwner, + double dMaxLoadFactor = HashTable::m_defMaxLoadFactor /* 0.8 */, + double dGrowFactor = HashTable::m_defDefGrowFactor /* 2.0 */ ); ~HashTable(); - + BOOL IsFull() const; ULONG GetSize() const { return m_lSize; } void* Find (String const& Key) const; BOOL Insert (String const& Key, void* pObject); void* Delete (String const& Key); -}; +}; // ADT hash table iterator // // Invariante: 0 <= m_lAt < m_aTable.GetCount() -// +// class HashTableIterator { - ULONG m_lAt; + ULONG m_lAt; HashTable const& m_aTable; void* FindValidObject(BOOL bForward); @@ -125,12 +125,12 @@ public: class ClassName : public HashTable \ { \ public: \ - ClassName \ - ( \ - ULONG lSize, \ - double dMaxLoadFactor = HashTable::m_defMaxLoadFactor, \ - double dGrowFactor = HashTable::m_defDefGrowFactor \ - ) \ + ClassName \ + ( \ + ULONG lSize, \ + double dMaxLoadFactor = HashTable::m_defMaxLoadFactor, \ + double dGrowFactor = HashTable::m_defDefGrowFactor \ + ) \ : HashTable(lSize,Owner,dMaxLoadFactor,dGrowFactor) {} \ \ ObjType Find (KeyType const& Key) const \ @@ -141,7 +141,7 @@ public: \ ObjType Delete (KeyType const&Key) \ { return (ObjType) HashTable::Delete (String(Key)); } \ - }; + }; // HashTable OHNE Owner-Verhalten #define DECLARE_HASHTABLE(ClassName,KeyType,ObjType) \ @@ -155,15 +155,15 @@ public: protected: \ virtual void OnDeleteObject(void* pObject); \ public: \ - ClassName \ - ( \ - ULONG lSize, \ - double dMaxLoadFactor = HashTable::m_defMaxLoadFactor, \ - double dGrowFactor = HashTable::m_defDefGrowFactor \ - ) \ - : ClassName##2(lSize,dMaxLoadFactor,dGrowFactor) {} \ + ClassName \ + ( \ + ULONG lSize, \ + double dMaxLoadFactor = HashTable::m_defMaxLoadFactor, \ + double dGrowFactor = HashTable::m_defDefGrowFactor \ + ) \ + : ClassName##2(lSize,dMaxLoadFactor,dGrowFactor) {} \ ~ClassName(); \ - }; + }; #define IMPLEMENT_HASHTABLE_OWNER(ClassName,KeyType,ObjType) \ void ClassName::OnDeleteObject(void* pObject) \ @@ -181,23 +181,23 @@ public: // Iterator-Makros -------------------------------------------------- -#define DECLARE_HASHTABLE_ITERATOR(ClassName,ObjType) \ - class ClassName : public HashTableIterator \ - { \ - public: \ - ClassName(HashTable const& aTable) \ - : HashTableIterator(aTable) {} \ +#define DECLARE_HASHTABLE_ITERATOR(ClassName,ObjType) \ + class ClassName : public HashTableIterator \ + { \ + public: \ + ClassName(HashTable const& aTable) \ + : HashTableIterator(aTable) {} \ \ - ObjType GetFirst() \ - { return (ObjType)HashTableIterator::GetFirst(); } \ - ObjType GetNext() \ - { return (ObjType)HashTableIterator::GetNext(); } \ - ObjType GetLast() \ - { return (ObjType)HashTableIterator::GetLast(); } \ - ObjType GetPrev() \ - { return (ObjType)HashTableIterator::GetPrev(); } \ + ObjType GetFirst() \ + { return (ObjType)HashTableIterator::GetFirst(); } \ + ObjType GetNext() \ + { return (ObjType)HashTableIterator::GetNext(); } \ + ObjType GetLast() \ + { return (ObjType)HashTableIterator::GetLast(); } \ + ObjType GetPrev() \ + { return (ObjType)HashTableIterator::GetPrev(); } \ }; - + #endif // _HASHTBL_HXX diff --git a/tools/workben/helloworld.c b/tools/workben/helloworld.c index 5a1f76c1e8d7..5d86cf2db21b 100644 --- a/tools/workben/helloworld.c +++ b/tools/workben/helloworld.c @@ -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/tools/workben/inetmimetest.cxx b/tools/workben/inetmimetest.cxx index 66c07e938ea2..e380fb7f6fbe 100644 --- a/tools/workben/inetmimetest.cxx +++ b/tools/workben/inetmimetest.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/tools/workben/solar.c b/tools/workben/solar.c index b7458d834da4..06c4a787ec72 100644 --- a/tools/workben/solar.c +++ b/tools/workben/solar.c @@ -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 @@ -67,11 +67,11 @@ int check( TestFunc func, Type eT, void* p ); #else #endif -#define printTypeSize(Type,Name) printf( "sizeof(%s)\t= %d\n", Name, \ +#define printTypeSize(Type,Name) printf( "sizeof(%s)\t= %d\n", Name, \ sizeof (Type) ) -#define isSignedType(Type) (((Type)-1) < 0) -#define printTypeSign(Type,Name) printf( "%s\t= %s %s\n", Name, \ +#define isSignedType(Type) (((Type)-1) < 0) +#define printTypeSign(Type,Name) printf( "%s\t= %s %s\n", Name, \ ( isSignedType(Type) ? "unsigned" : "signed" ), Name ) @@ -162,7 +162,7 @@ void __cdecl SignalHandler( int sig ) bSignal = 1; /* fprintf( stderr, "Signal %d caught\n", sig ); - signal( sig, SignalHandler ); + signal( sig, SignalHandler ); */ longjmp( check_env, sig ); } @@ -192,15 +192,15 @@ int check( TestFunc func, Type eT, void* p ) if ( !setjmp( check_env ) ) { - signal( SIGSEGV, SignalHandler ); + signal( SIGSEGV, SignalHandler ); #ifdef UNX - signal( SIGBUS, SignalHandler ); + signal( SIGBUS, SignalHandler ); #else #endif result = func( eT, p ); - signal( SIGSEGV, SIG_DFL ); + signal( SIGSEGV, SIG_DFL ); #ifdef UNX - signal( SIGBUS, SIG_DFL ); + signal( SIGBUS, SIG_DFL ); #else #endif } @@ -219,11 +219,11 @@ int GetAtAddress( Type eT, void* p ) { switch ( eT ) { - case t_char: return *((char*)p); - case t_short: return *((short*)p); - case t_int: return *((int*)p); - case t_long: return *((long*)p); - case t_double: return *((double*)p); + case t_char: return *((char*)p); + case t_short: return *((short*)p); + case t_int: return *((int*)p); + case t_long: return *((long*)p); + case t_double: return *((double*)p); } abort(); } @@ -232,11 +232,11 @@ int SetAtAddress( Type eT, void* p ) { switch ( eT ) { - case t_char: return *((char*)p) = 0; - case t_short: return *((short*)p) = 0; - case t_int: return *((int*)p) = 0; - case t_long: return *((long*)p) = 0; - case t_double: return *((double*)p)= 0; + case t_char: return *((char*)p) = 0; + case t_short: return *((short*)p) = 0; + case t_int: return *((int*)p) = 0; + case t_long: return *((long*)p) = 0; + case t_double: return *((double*)p)= 0; } abort(); } @@ -245,11 +245,11 @@ char* TypeName( Type eT ) { switch ( eT ) { - case t_char: return "char"; - case t_short: return "short"; - case t_int: return "int"; - case t_long: return "long"; - case t_double: return "double"; + case t_char: return "char"; + case t_short: return "short"; + case t_int: return "int"; + case t_long: return "long"; + case t_double: return "double"; } abort(); } @@ -279,9 +279,9 @@ int CheckSetAccess( Type eT, void* p ) int GetAlignment( Type eT ) { - char a[ 16*8 ]; - int p = (int)(void*)&a; - int i; + char a[ 16*8 ]; + int p = (int)(void*)&a; + int i; p = ( p + 0xF ) & ~0xF; for ( i = 1; i < 16; i++ ) if ( CheckGetAccess( eT, (void*)(p+i) ) ) @@ -306,17 +306,17 @@ int CheckCharAccess( char* p ) struct Description { - int bBigEndian; - int bStackGrowsDown; - int nStackAlignment; - int nAlignment[3]; /* 2,4,8 */ + int bBigEndian; + int bStackGrowsDown; + int nStackAlignment; + int nAlignment[3]; /* 2,4,8 */ }; void Description_Ctor( struct Description* pThis ) { - pThis->bBigEndian = IsBigEndian(); - pThis->bStackGrowsDown = IsStackGrowingDown(); - pThis->nStackAlignment = GetStackAlignment(); + pThis->bBigEndian = IsBigEndian(); + pThis->bStackGrowsDown = IsStackGrowingDown(); + pThis->nStackAlignment = GetStackAlignment(); if ( sizeof(short) != 2 ) abort(); diff --git a/tools/workben/tldem.cxx b/tools/workben/tldem.cxx index f83c3aa8ee90..9571d3ff9b94 100644 --- a/tools/workben/tldem.cxx +++ b/tools/workben/tldem.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,4 +79,4 @@ main( int argc, char **argv ) return 0; } - + diff --git a/tools/workben/urltest.cxx b/tools/workben/urltest.cxx index bab1728255b5..0930dfcc5239 100644 --- a/tools/workben/urltest.cxx +++ b/tools/workben/urltest.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -190,7 +190,7 @@ bool testSetFSys(SetFSysTest const * pTest, std::size_t nSize) { String aTestA = aUrl1.GetMainURL(INetURLObject::NO_DECODE); String aTestB = aUrl2.GetMainURL(INetURLObject::NO_DECODE); - + printf(" BAD %s %s -> %s, %s (%s)\n", ByteString(aPath, RTL_TEXTENCODING_ISO_8859_1).GetBuffer(), toString(pTest[i].m_eStyle), |