sc/inc/global.hxx | 15 --------------- sfx2/source/inc/sfxtypes.hxx | 31 ------------------------------- store/workben/t_store.cxx | 17 ----------------- 3 files changed, 63 deletions(-)
New commits: commit 512de6e75d34d2144392d1e78c25446f2d0b3a35 Author: Michael Stahl <mst...@redhat.com> Date: Thu Mar 27 14:28:11 2014 +0100 sfx2, sc: remove macros for using Windows NT Call Profiler Apparently this tool was available for early versions of NT; googling finds a caplib.zip from 1992 but that is missing the CAP.dll so there's no way to use this anyway. http://cd.textfiles.com/cica/cica9308/UNZIPPED/NT/CAPLIB/CAP.TXT Change-Id: I4718af0e175b78bcdad38bbca0fc9579b3b12111 diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 51afdb1..0d94fb3 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -37,21 +37,6 @@ class Bitmap; class SfxItemSet; class Color; -// Macro for call profiler (WinNT) -// S_CAP starts a measurement, E_CAP stops it -#if defined( WNT ) && defined( PROFILE ) - -extern "C" { - void StartCAP(); - void StopCAP(); - void DumpCAP(); -}; - -#define S_CAP StartCAP(); -#define E_CAP StopCAP(); DumpCAP(); - -#endif - #define SC_COLLATOR_IGNORES ( \ ::com::sun::star::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE ) diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx index 22d199b..d55e299 100644 --- a/sfx2/source/inc/sfxtypes.hxx +++ b/sfx2/source/inc/sfxtypes.hxx @@ -41,37 +41,6 @@ #endif #endif - - -// Macro for the Call-Profiler under WinNT -// with S_CAP a measurement can be started, and stopped with E_CAP -#if defined( WNT ) && defined( PROFILE ) - -extern "C" { - void StartCAP(); - void StopCAP(); - void DumpCAP(); -}; - -#define S_CAP() StartCAP(); -#define E_CAP() StopCAP(); DumpCAP(); - -struct _Capper -{ - _Capper() { S_CAP(); } - ~_Capper() { E_CAP(); } -}; - -#define CAP _Capper _aCap_ - -#else - -#define S_CAP() -#define E_CAP() -#define CAP - -#endif - #ifndef DBG #ifdef DBG_UTIL #define DBG(statement) statement diff --git a/store/workben/t_store.cxx b/store/workben/t_store.cxx index 7a44fb9..160d3d8 100644 --- a/store/workben/t_store.cxx +++ b/store/workben/t_store.cxx @@ -27,15 +27,6 @@ #include <stdio.h> -#if (defined(WNT) && defined(PROFILE)) -extern "C" -{ - void StartCAP (void); - void StopCAP (void); - void DumpCAP (void); -} -#endif /* PROFILE */ - /*======================================================================== * * Internals. @@ -213,11 +204,7 @@ sal_Bool DirectoryTraveller::visit (const iter& it) *======================================================================*/ int SAL_CALL main (int argc, char **argv) { -#if (defined(WNT) && defined(PROFILE)) - StartCAP(); -#else OTime aMainStartTime (OTime::getSystemTime()); -#endif /* PROFILE */ store::OStoreFile aFile; storeError eErrCode = store_E_None; @@ -557,10 +544,6 @@ int SAL_CALL main (int argc, char **argv) // Done. aFile.close(); -#if (defined(WNT) && defined(PROFILE)) - StopCAP(); - DumpCAP(); -#endif /* PROFILE */ #ifndef PROFILE OTime aDelta (OTime::getSystemTime() - aMainStartTime); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits