summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorRelease Engineers <releng@openoffice.org>2009-07-03 10:14:57 +0000
committerRelease Engineers <releng@openoffice.org>2009-07-03 10:14:57 +0000
commit7b1aa3fa4d21549fbfc726301c5f8878a2ccb347 (patch)
tree69513f87b5853feef1c079d048429ace9767f953 /sal
parent40814138b1938d68b81fc7069c5c77ba306b0e4e (diff)
CWS-TOOLING: integrate CWS perftest08
2009-07-02 10:03:16 +0200 lla r273621 : #159516# support systems with no JAVA_HOME 2009-07-02 10:00:25 +0200 lla r273620 : #159516# if path is null this not an error 2009-07-01 14:36:05 +0200 lla r273583 : #159516# add check for wrong cygwin path 2009-06-22 13:18:14 +0200 lla r273223 : #159516# add PipeConnectionString 2009-06-18 21:44:59 +0200 lla r273137 : #159516# cleanups 2009-06-18 21:44:17 +0200 lla r273136 : #159516# handle null 2009-06-18 21:42:56 +0200 lla r273135 : #159516# add getElementCount() function 2009-06-15 10:40:05 +0200 lla r272966 : CWS-TOOLING: rebase CWS perftest08 to trunk@272827 (milestone: DEV300:m50) 2009-06-02 09:06:22 +0200 lla r272480 : CWS-TOOLING: rebase CWS perftest08 to trunk@272291 (milestone: DEV300:m49) 2009-05-08 11:40:22 +0200 mib r271710 : #159717#: File name info for performance test (added void to hasLogFile() parameter list) 2009-05-05 14:14:25 +0200 mib r271514 : #159717#: File name info for performance test 2009-05-04 15:23:01 +0200 mib r271466 : #159717#: File name infor for performance test 2009-05-04 15:22:27 +0200 mib r271465 : #159717#: File name infor for performance test 2009-05-04 15:21:56 +0200 mib r271464 : #159717#: File name infor for performance test 2009-05-04 15:21:18 +0200 mib r271462 : #159717#: File name infor for performance test 2009-04-29 16:23:40 +0200 lla r271383 : #159516# cleanups 2009-04-29 16:23:20 +0200 lla r271382 : #159516# cleanups 2009-04-08 12:23:01 +0200 lla r270631 : #159516# typo 2009-04-07 10:30:35 +0200 lla r270580 : #159516# add prototype 2009-04-07 10:21:15 +0200 lla r270579 : #159516# cleanup 2009-04-03 09:05:26 +0200 lla r270448 : #159516# small cleanups 2009-03-30 13:22:26 +0200 lla r270221 : #159517# merge perftest07
Diffstat (limited to 'sal')
-rw-r--r--sal/inc/rtl/logfile.h8
-rw-r--r--sal/inc/rtl/logfile.hxx11
-rw-r--r--sal/rtl/source/logfile.cxx5
-rwxr-xr-xsal/util/sal.map5
4 files changed, 27 insertions, 2 deletions
diff --git a/sal/inc/rtl/logfile.h b/sal/inc/rtl/logfile.h
index 232232a4c3ed..66789d92426e 100644
--- a/sal/inc/rtl/logfile.h
+++ b/sal/inc/rtl/logfile.h
@@ -67,6 +67,14 @@ void SAL_CALL rtl_logfile_trace( const sal_Char* pszFormat, ... );
*/
void SAL_CALL rtl_logfile_longTrace(char const * format, ...);
+/** Return if a log file is written.
+
+ @return true if a log file is written
+
+ @since UDK 3.2.11
+*/
+sal_Bool SAL_CALL rtl_logfile_hasLogFile( void );
+
#ifdef __cplusplus
}
#endif
diff --git a/sal/inc/rtl/logfile.hxx b/sal/inc/rtl/logfile.hxx
index 7ce33f3ea28a..5eae13b62952 100644
--- a/sal/inc/rtl/logfile.hxx
+++ b/sal/inc/rtl/logfile.hxx
@@ -189,12 +189,19 @@ namespace rtl
#define RTL_LOGFILE_PRODUCT_TRACE( string ) \
rtl_logfile_longTrace( "| : %s\n", string )
-#define RTL_LOGFILE_PRODUCT_CONTEXT( instance, name ) \
- ::rtl::Logfile instance( name )
#define RTL_LOGFILE_PRODUCT_TRACE1( frmt, arg1 ) \
rtl_logfile_longTrace( "| : " ); \
rtl_logfile_trace( frmt, arg1 ); \
rtl_logfile_trace( "\n" )
+#define RTL_LOGFILE_PRODUCT_CONTEXT( instance, name ) \
+ ::rtl::Logfile instance( name )
+#define RTL_LOGFILE_PRODUCT_CONTEXT_TRACE1( instance, frmt, arg1 ) \
+ rtl_logfile_longTrace( "| %s : ", \
+ instance.getName() ); \
+ rtl_logfile_trace( frmt, arg1 ); \
+ rtl_logfile_trace( "\n" )
+#define RTL_LOGFILE_HASLOGFILE() \
+ rtl_logfile_hasLogFile()
#endif
diff --git a/sal/rtl/source/logfile.cxx b/sal/rtl/source/logfile.cxx
index 9bd0a939513b..476dea11393d 100644
--- a/sal/rtl/source/logfile.cxx
+++ b/sal/rtl/source/logfile.cxx
@@ -250,3 +250,8 @@ extern "C" void SAL_CALL rtl_logfile_longTrace(char const * format, ...) {
va_end(args);
}
}
+
+extern "C" sal_Bool SAL_CALL rtl_logfile_hasLogFile( void ) {
+ init();
+ return g_buffer != 0;
+}
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 03af5c114aa1..ad063f3794d4 100755
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -588,6 +588,11 @@ UDK_3.9 { # OOo 3.1
rtl_math_atanh;
} UDK_3.8;
+UDK_3.10 { # OOo 3.2
+ global:
+ rtl_logfile_hasLogFile;
+} UDK_3.9;
+
PRIVATE_1.0 {
global:
osl_detail_ObjectRegistry_storeAddresses;