connectivity/Library_jdbc.mk | 1 +
connectivity/Library_kab1.mk | 1 +
connectivity/Library_macab1.mk | 1 +
connectivity/Library_mork.mk | 1 +
connectivity/Library_sdbc2.mk | 1 +
extensions/Library_log.mk | 1 +
include/tools/diagnose_ex.h | 3 ++-
tools/source/debug/debug.cxx | 2 +-
ucb/Library_ucpext.mk | 1 +
xmlscript/Library_xmlscript.mk | 1 +
10 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit cec32a4ea3a040003d21981e5feae1857e970b91
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue May 21 16:24:42 2013 +0300
Add tl for DbgUnhandledException()
Change-Id: I612f0e473280342f4e406ebee7002a40622fbbf0
(cherry picked from commit 0dfa58bdd9bd2ee12fe00674e7a9a1b55939a84b)
Signed-off-by: Fridrich Å trba <fridrich.st...@bluewin.ch>
diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk
index 8c33fda..263d0b1 100644
--- a/connectivity/Library_macab1.mk
+++ b/connectivity/Library_macab1.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_Library_use_libraries,macab1,\
dbtools \
sal \
salhelper \
+ tl \
))
$(eval $(call gb_Library_set_include,macab1,\
commit 2f4ae00307041232a9b6bcddc393b0ee5b14b379
Author: Noel Grandin <n...@peralex.com>
Date: Tue May 21 14:45:32 2013 +0200
more linking fix
for my diagose_ex.h change
Change-Id: I6f9224942b5ccac0ae6b61a595bfe6a3c7463b7b
(cherry picked from commit dbcc5bc9d936533794c194d7d33c59c840e76b68)
Signed-off-by: Fridrich Å trba <fridrich.st...@bluewin.ch>
diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk
index 5f7782b..4a301b6 100644
--- a/connectivity/Library_kab1.mk
+++ b/connectivity/Library_kab1.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_libraries,kab1,\
dbtools \
sal \
salhelper \
+ tl \
))
$(eval $(call gb_Library_add_exception_objects,kab1,\
commit aed72ecb2805117c52645b38fce274fc9a4af619
Author: Noel Grandin <n...@peralex.com>
Date: Tue May 21 13:50:45 2013 +0200
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.st...@bluewin.ch>
diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk
index 9222bc5..68282c0 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 4041049..18917c5 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 e8da462..146b966 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 d0a9518..1227f9d 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 a38b2d4..4c27193 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 eec15eb..3f950ca 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 0d5237c..e492579 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 869109a..fa680d1 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) \
))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
