From 2f26cde2de08d8e10c5ca7eee79ec62b6f33e7fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Tue, 10 Jan 2006 14:50:29 +0000 Subject: [PATCH] INTEGRATION: CWS sb41 (1.7.16); FILE MERGED 2005/12/16 10:48:01 sb 1.7.16.1: #i57855# Moved internal cppu.XExceptionThrower to cppuhelper.detail.XExceptionThrower to work around compilation error with MSC. --- cppuhelper/source/exc_thrower.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx index d8e270b1732e..2e4d88ef0eec 100644 --- a/cppuhelper/source/exc_thrower.cxx +++ b/cppuhelper/source/exc_thrower.cxx @@ -4,9 +4,9 @@ * * $RCSfile: exc_thrower.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-08 09:25:52 $ + * last change: $Author: rt $ $Date: 2006-01-10 15:50:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -38,7 +38,7 @@ #include "osl/mutex.hxx" #include "uno/dispatcher.hxx" #include "uno/mapping.hxx" -#include "cppu/XExceptionThrower.hpp" +#include "cppuhelper/detail/XExceptionThrower.hpp" #include "com/sun/star/uno/RuntimeException.hpp" #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) @@ -52,6 +52,8 @@ using namespace ::com::sun::star::uno; namespace { +using cppuhelper::detail::XExceptionThrower; + //============================================================================== struct ExceptionThrower : public uno_Interface, XExceptionThrower {