summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-05-21 13:50:45 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2013-05-21 15:01:22 +0200
commitaed72ecb2805117c52645b38fce274fc9a4af619 (patch)
tree75e2bb9fda53ec5844bf6c3dfe1221866eea7129
parent923e81c6b5a9f7eddf7138cffc44d802a883c72d (diff)
fix for linking
caused by my commit 863d38fbfa4fb4861e476828c46410602100919e "move DBG_UNHANDLED_EXCEPTION out of line" Change-Id: Idfd84d987ba9151ba476ce0516a9e5fbdb2003ec (cherry picked from commit 6bf00f0f94394c62bddcd77b776e4e3592160201) Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
-rw-r--r--connectivity/Library_jdbc.mk1
-rw-r--r--connectivity/Library_mork.mk1
-rw-r--r--connectivity/Library_sdbc2.mk1
-rw-r--r--extensions/Library_log.mk1
-rw-r--r--include/tools/diagnose_ex.h3
-rw-r--r--tools/source/debug/debug.cxx2
-rw-r--r--ucb/Library_ucpext.mk1
-rw-r--r--xmlscript/Library_xmlscript.mk1
8 files changed, 9 insertions, 2 deletions
diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk
index 9222bc5694eb..68282c073e2e 100644
--- a/connectivity/Library_jdbc.mk
+++ b/connectivity/Library_jdbc.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_libraries,jdbc,\
salhelper \
jvmaccess \
dbtools \
+ tl \
utl \
jvmfwk \
comphelper \
diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk
index 4041049f28a0..18917c572978 100644
--- a/connectivity/Library_mork.mk
+++ b/connectivity/Library_mork.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Library_use_libraries,mork, \
dbtools \
sal \
salhelper \
+ tl \
utl \
$(gb_UWINAPI) \
))
diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk
index e8da4622492e..146b9668088b 100644
--- a/connectivity/Library_sdbc2.mk
+++ b/connectivity/Library_sdbc2.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,sdbc2,\
dbtools \
utl \
sal \
+ tl \
$(gb_UWINAPI) \
))
diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk
index d0a9518938c5..1227f9dac251 100644
--- a/extensions/Library_log.mk
+++ b/extensions/Library_log.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,log,\
cppuhelper \
cppu \
sal \
+ tl \
$(gb_UWINAPI) \
))
diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h
index a38b2d4c0a38..4c271939b643 100644
--- a/include/tools/diagnose_ex.h
+++ b/include/tools/diagnose_ex.h
@@ -40,8 +40,9 @@
#include <osl/thread.h>
#include <boost/current_function.hpp>
#include <typeinfo>
+ #include <tools/toolsdllapi.h>
- void DbgUnhandledException(const ::com::sun::star::uno::Any& caughtException, const char* currentFunction);
+ TOOLS_DLLPUBLIC void DbgUnhandledException(const ::com::sun::star::uno::Any& caughtException, const char* currentFunction);
/** reports a caught UNO exception via OSL diagnostics
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index eec15eb70569..3f950ca8dd54 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -1589,7 +1589,7 @@ void DbgOutf( const sal_Char*, ... ) {}
#if OSL_DEBUG_LEVEL > 0
-void DbgUnhandledException(const css::uno::Any & caught, const char* currentFunction)
+TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any & caught, const char* currentFunction)
{
OString sMessage( "caught an exception!" );
sMessage += "\nin function:";
diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk
index 0d5237c91b95..e492579ac05b 100644
--- a/ucb/Library_ucpext.mk
+++ b/ucb/Library_ucpext.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_Library_use_libraries,ucpext,\
cppuhelper \
sal \
salhelper \
+ tl \
ucbhelper \
$(gb_UWINAPI) \
))
diff --git a/xmlscript/Library_xmlscript.mk b/xmlscript/Library_xmlscript.mk
index 869109a98a5d..fa680d17bb38 100644
--- a/xmlscript/Library_xmlscript.mk
+++ b/xmlscript/Library_xmlscript.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_Library_use_libraries,xmlscript,\
cppu \
cppuhelper \
sal \
+ tl \
$(gb_UWINAPI) \
))