diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-12-09 11:45:24 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-09 13:57:16 +0000 |
commit | 87ec1f8857e77c0b8d559fa92416f44b68dd1e63 (patch) | |
tree | c6aca1bbfe5bbf8749a870c1a1cbc05399aa4a2e /tools | |
parent | 17d5cdfff9a2f8a311428b981a3998b8e33b4d82 (diff) |
callcatcher: remove unused code post automation removal
Diffstat (limited to 'tools')
-rw-r--r-- | tools/inc/tools/config.hxx | 2 | ||||
-rw-r--r-- | tools/inc/tools/fsys.hxx | 1 | ||||
-rw-r--r-- | tools/inc/tools/time.hxx | 1 | ||||
-rw-r--r-- | tools/source/datetime/ttime.cxx | 27 | ||||
-rw-r--r-- | tools/source/fsys/fstat.cxx | 20 | ||||
-rw-r--r-- | tools/source/generic/config.cxx | 68 |
6 files changed, 0 insertions, 119 deletions
diff --git a/tools/inc/tools/config.hxx b/tools/inc/tools/config.hxx index 1c904b824447..478f7653291e 100644 --- a/tools/inc/tools/config.hxx +++ b/tools/inc/tools/config.hxx @@ -60,8 +60,6 @@ public: ~Config(); const XubString& GetPathName() const { return maFileName; } - static XubString GetDefDirectory(); - static XubString GetConfigName( const XubString& rPath, const XubString& rBaseName ); void SetGroup(const rtl::OString& rGroup); const rtl::OString& GetGroup() const { return maGroupName; } diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx index f4d01cd3d95d..33cb5e13ceb5 100644 --- a/tools/inc/tools/fsys.hxx +++ b/tools/inc/tools/fsys.hxx @@ -201,7 +201,6 @@ public: Time TimeModified() const { return aTimeModified; } Date DateAccessed() const { return aDateAccessed; } Time TimeAccessed() const { return aTimeAccessed; } - sal_Bool IsYounger( const FileStat& rIsOlder ) const; static sal_uIntPtr SetReadOnlyFlag( const DirEntry &rEntry, sal_Bool bRO = sal_True ); static sal_Bool GetReadOnlyFlag( const DirEntry &rEntry ); diff --git a/tools/inc/tools/time.hxx b/tools/inc/tools/time.hxx index e71fca848829..28e8477e0db9 100644 --- a/tools/inc/tools/time.hxx +++ b/tools/inc/tools/time.hxx @@ -115,7 +115,6 @@ public: static Time GetUTCOffset(); static sal_uIntPtr GetSystemTicks(); // Elapsed time - static sal_uIntPtr GetProcessTicks(); // CPU time void ConvertToUTC() { *this -= Time::GetUTCOffset(); } void ConvertToLocalTime() { *this += Time::GetUTCOffset(); } diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx index 015ab374760c..4a377e2b226e 100644 --- a/tools/source/datetime/ttime.cxx +++ b/tools/source/datetime/ttime.cxx @@ -373,31 +373,4 @@ sal_uIntPtr Time::GetSystemTicks() #endif } -// ----------------------------------------------------------------------- - -sal_uIntPtr Time::GetProcessTicks() -{ -#if defined WNT - return (sal_uIntPtr)GetTickCount(); -#else - static sal_uIntPtr nImplTicksPerSecond = 0; - static double dImplTicksPerSecond; - static double dImplTicksULONGMAX; - sal_uIntPtr nTicks = (sal_uIntPtr)clock(); - - if ( !nImplTicksPerSecond ) - { - nImplTicksPerSecond = CLOCKS_PER_SEC; - dImplTicksPerSecond = nImplTicksPerSecond; - dImplTicksULONGMAX = (double)(sal_uIntPtr)ULONG_MAX; - } - - double fTicks = nTicks; - fTicks *= 1000; - fTicks /= dImplTicksPerSecond; - fTicks = fmod (fTicks, dImplTicksULONGMAX); - return (sal_uIntPtr)fTicks; -#endif -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/source/fsys/fstat.cxx b/tools/source/fsys/fstat.cxx index cd631299d4bd..3752aad6d222 100644 --- a/tools/source/fsys/fstat.cxx +++ b/tools/source/fsys/fstat.cxx @@ -98,26 +98,6 @@ FileStat::FileStat( const DirEntry& rDirEntry, FSysAccess nAccess ) /************************************************************************* |* -|* FileStat::IsYounger() -|* -*************************************************************************/ - -// sal_True wenn die Instanz j"unger als rIsOlder ist. -// sal_False wenn die Instanz "alter oder gleich alt wie rIsOlder ist. - -sal_Bool FileStat::IsYounger( const FileStat& rIsOlder ) const -{ - if ( aDateModified > rIsOlder.aDateModified ) - return sal_True; - if ( ( aDateModified == rIsOlder.aDateModified ) && - ( aTimeModified > rIsOlder.aTimeModified ) ) - return sal_True; - - return sal_False; -} - -/************************************************************************* -|* |* FileStat::IsKind() |* *************************************************************************/ diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx index 253b3bcb7498..ed21da9cefd0 100644 --- a/tools/source/generic/config.cxx +++ b/tools/source/generic/config.cxx @@ -200,54 +200,6 @@ static sal_Bool ImplSysWriteConfig( const XubString& rFileName, // ----------------------------------------------------------------------- -static String ImplMakeConfigName( const XubString* pFileName, - const XubString* pPathName ) -{ - ::rtl::OUString aFileName; - ::rtl::OUString aPathName; - if ( pFileName ) - { -#ifdef UNX - aFileName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." )); - aFileName += *pFileName; - aFileName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "rc" )); -#else - aFileName = *pFileName; - aFileName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".ini" )); -#endif - } - else - { -#ifdef UNX - aFileName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".sversionrc" )); -#else - aFileName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sversion.ini" )); -#endif - } - - // #88208# in case pPathName is set but empty and pFileName is set - // and not empty just return the filename; on the default case - // prepend default path as usual - if ( pPathName && pPathName->Len() ) - aPathName = toUncPath( *pPathName ); - else if( pPathName && pFileName && pFileName->Len() ) - return aFileName; - else - { - oslSecurity aSec = osl_getCurrentSecurity(); - osl_getConfigDir( aSec, &aPathName.pData ); - osl_freeSecurityHandle( aSec ); - } - - ::rtl::OUString aName( aPathName ); - aName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" )); - aName += aFileName; - - return aName; -} - -// ----------------------------------------------------------------------- - namespace { rtl::OString makeOString(const sal_uInt8* p, sal_uInt64 n) @@ -793,26 +745,6 @@ Config::~Config() // ----------------------------------------------------------------------- -String Config::GetDefDirectory() -{ - ::rtl::OUString aDefConfig; - oslSecurity aSec = osl_getCurrentSecurity(); - osl_getConfigDir( aSec, &aDefConfig.pData ); - osl_freeSecurityHandle( aSec ); - - return aDefConfig; -} - -// ----------------------------------------------------------------------- - -XubString Config::GetConfigName( const XubString& rPath, - const XubString& rBaseName ) -{ - return ImplMakeConfigName( &rBaseName, &rPath ); -} - -// ----------------------------------------------------------------------- - void Config::SetGroup(const rtl::OString& rGroup) { // Wenn neue Gruppe gesetzt wird, muss beim naechsten mal die |