mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS sb41 (1.7.16); FILE MERGED

Browse Source 
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.
This commit is contained in:
Rüdiger Timm
2006-01-10 14:50:29 +00:00
parent 22a36fdb5c
commit 2f26cde2de
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cppuhelper/source/exc_thrower.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: exc_thrower.cxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -38,7 +38,7 @@
#include "osl/mutex.hxx" #include "osl/mutex.hxx"
#include "uno/dispatcher.hxx" #include "uno/dispatcher.hxx"
#include "uno/mapping.hxx" #include "uno/mapping.hxx"
#include "cppu/XExceptionThrower.hpp" #include "cppuhelper/detail/XExceptionThrower.hpp"
#include "com/sun/star/uno/RuntimeException.hpp" #include "com/sun/star/uno/RuntimeException.hpp"
#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
@@ -52,6 +52,8 @@ using namespace ::com::sun::star::uno;
namespace namespace
{ {
using cppuhelper::detail::XExceptionThrower;
//============================================================================== //==============================================================================
struct ExceptionThrower : public uno_Interface, XExceptionThrower struct ExceptionThrower : public uno_Interface, XExceptionThrower
{ {