diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-12 15:47:21 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-12 15:47:21 +0000 |
| commit | a07661ac5df58c6b62b5ef62225dea6a6e635e09 (patch) | |
| tree | 09a1560f1c585ad56448a636cb9720b11c5e305d /sd/source/helper/simplereferencecomponent.cxx | |
| parent | 5f6696fc2ae42a377ed6327608089cbb320df389 (diff) | |
INTEGRATION: CWS sdwarningsbegone (1.3.38); FILE MERGED
2006/11/27 13:47:54 cl 1.3.38.1: #i69285# warning free code changes for sd project
Diffstat (limited to 'sd/source/helper/simplereferencecomponent.cxx')
| -rw-r--r-- | sd/source/helper/simplereferencecomponent.cxx | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx index b3e8bec12183..acbd43a7ba10 100644 --- a/sd/source/helper/simplereferencecomponent.cxx +++ b/sd/source/helper/simplereferencecomponent.cxx @@ -4,9 +4,9 @@ * * $RCSfile: simplereferencecomponent.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: obo $ $Date: 2006-09-16 18:23:47 $ + * last change: $Author: kz $ $Date: 2006-12-12 16:47:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -79,7 +79,11 @@ void SimpleReferenceComponent::release() { Dispose(); } - catch (RuntimeException & exc) // don't break throw () + catch (RuntimeException & +#if OSL_DEBUG_LEVEL > 0 + exc +#endif + ) // don't break throw () { #if OSL_DEBUG_LEVEL > 0 rtl::OString msg( rtl::OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); @@ -111,7 +115,11 @@ void * SimpleReferenceComponent::operator new(std::size_t nSize) } void * SimpleReferenceComponent::operator new(std::size_t nSize, - std::nothrow_t const & rNothrow) + std::nothrow_t const & +#ifndef WNT + rNothrow +#endif + ) SAL_THROW(()) { #if defined WNT @@ -128,7 +136,11 @@ void SimpleReferenceComponent::operator delete(void * pPtr) SAL_THROW(()) } void SimpleReferenceComponent::operator delete(void * pPtr, - std::nothrow_t const & rNothrow) + std::nothrow_t const & +#ifndef WNT + rNothrow +#endif +) SAL_THROW(()) { #if defined WNT || (defined IRIX && !defined GCC) |