summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-02-13 11:55:44 +0000
committerOliver Bolte <obo@openoffice.org>2009-02-13 11:55:44 +0000
commit6ecb6ca9ab45dbcc35463c95025ad84ab2a6bda9 (patch)
treed64ca584ad98a2c32d80987f49bde4b3e227ac78 /tools
parent6366f1e08bedfc1ed6fd654d5fc722a4818f619f (diff)
CWS-TOOLING: integrate CWS oooimprovement2
2009-01-28 14:35:33 +0100 b_michaelsen r267059 : #i98555# fixed help url 2009-01-27 12:47:40 +0100 b_michaelsen r266982 : #159112# fixed enabling vcl part of usage tracking in an running session 2009-01-27 12:28:58 +0100 b_michaelsen r266980 : #159129# deiniting eventlogger in vcl if it was inited, not if it was enabled (the logger can be disabled inbetween 2009-01-27 12:22:45 +0100 b_michaelsen r266978 : whitespace fixes 2009-01-27 10:32:02 +0100 b_michaelsen r266962 : #i94949# disposing of uploader thread 2009-01-23 17:00:57 +0100 b_michaelsen r266839 : #159112# enabling/disabling of usage tracking takes effect without restart 2009-01-23 16:58:59 +0100 b_michaelsen r266837 : #159112# enabling/disabling of usage tracking takes effect without restart 2009-01-23 01:08:49 +0100 b_michaelsen r266761 : #159081# fixed buildid in oooimprovement 2009-01-22 22:51:16 +0100 b_michaelsen r266759 : #i90370# including build id 2009-01-22 15:37:05 +0100 b_michaelsen r266727 : #i90370# fixing precompiled headers for win32 2009-01-22 15:34:05 +0100 b_michaelsen r266722 : #i90370# initializing startup counter 2009-01-22 15:30:52 +0100 b_michaelsen r266720 : #i90370# enabling startup counter 2009-01-21 13:52:56 +0100 b_michaelsen r266666 : #i98143# adjusted smoketest for usage tracking 2009-01-20 18:34:12 +0100 b_michaelsen r266617 : #i90370# 2009-01-20 15:08:45 +0100 is r266587 : #i90370# new improvement feature 2009-01-20 14:42:39 +0100 b_michaelsen r266583 : #i90370# changing delivered job registration location 2009-01-20 12:35:31 +0100 is r266567 : #i90370# new improvement feature 2009-01-20 12:33:51 +0100 is r266566 : #i90370# new improvement feature 2009-01-20 12:33:20 +0100 is r266565 : #i90370# new improvement feature 2009-01-20 11:47:13 +0100 b_michaelsen r266559 : #i90370# updating Usage Tracking Info Url 2009-01-20 11:28:37 +0100 b_michaelsen r266558 : #i90370# packing Usage Tracking config schema (xcs) 2009-01-20 11:19:00 +0100 b_michaelsen r266557 : #i90370# adding Usage Tracking config schema (xcs) 2009-01-19 18:16:34 +0100 b_michaelsen r266518 : #i90370# adding job registration (xcu) 2009-01-19 17:26:02 +0100 b_michaelsen r266513 : #i90370# adding liboooimprovement
Diffstat (limited to 'tools')
-rw-r--r--tools/source/testtoolloader/testtoolloader.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/source/testtoolloader/testtoolloader.cxx b/tools/source/testtoolloader/testtoolloader.cxx
index a46b4d4c78c0..f0263c001e29 100644
--- a/tools/source/testtoolloader/testtoolloader.cxx
+++ b/tools/source/testtoolloader/testtoolloader.cxx
@@ -54,6 +54,7 @@ namespace tools
static oslModule aTestToolModule = 0;
// are we to be automated at all?
static bool bAutomate = false;
+static bool bLoggerStarted = false;
sal_uInt32 GetCommandLineParamCount()
@@ -137,7 +138,10 @@ void InitTestToolLib()
oslGenericFunction pInitFunc = osl_getFunctionSymbol(
aTestToolModule, aFuncName.pData );
if ( pInitFunc )
+ {
(reinterpret_cast< pfunc_CreateEventLogger >(pInitFunc))();
+ bLoggerStarted = TRUE;
+ }
else
{
DBG_ERROR1( "Unable to get Symbol 'CreateEventLogger' from library %s while loading testtool support.", SVLIBRARY( "sts" ) );
@@ -164,14 +168,17 @@ void DeInitTestToolLib()
(reinterpret_cast< pfunc_DestroyRemoteControl >(pDeInitFunc))();
}
- if ( ::comphelper::UiEventsLogger::isEnabled() )
+ if ( bLoggerStarted /*::comphelper::UiEventsLogger::isEnabled()*/ )
{
OUString aFuncName( RTL_CONSTASCII_USTRINGPARAM( "DestroyEventLogger" ));
oslGenericFunction pDeInitFunc = osl_getFunctionSymbol(
aTestToolModule, aFuncName.pData );
if ( pDeInitFunc )
+ {
(reinterpret_cast< pfunc_DestroyEventLogger >(pDeInitFunc))();
+ bLoggerStarted = FALSE;
+ }
}
osl_unloadModule( aTestToolModule );