diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-05 13:01:54 +0100 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-05 13:01:54 +0100 |
| commit | a2e95ebcc701038d4a1010d320a69681499f78ee (patch) | |
| tree | 1ab8774b5b3c409792e1db4a6057bbf2dc9ea431 | |
| parent | bbde1a25336acef8f28f801c3eed5830f56c62bb (diff) | |
| parent | 19eacd47c18d84cf2955b50faae90320bc0c183d (diff) | |
CWS-TOOLING: integrate CWS sb116ooo/DEV300_m69
| -rw-r--r-- | sd/source/helper/simplereferencecomponent.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/func/fubullet.cxx | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx index f714625ea..be8bd986e 100644 --- a/sd/source/helper/simplereferencecomponent.cxx +++ b/sd/source/helper/simplereferencecomponent.cxx @@ -135,7 +135,7 @@ void SimpleReferenceComponent::operator delete(void * pPtr, ) SAL_THROW(()) { -#if defined WNT || (defined IRIX && !defined GCC) +#if defined WNT ::operator delete(pPtr); // WNT lacks a global nothrow operator delete... #else // WNT ::operator delete(pPtr, rNothrow); diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index c158b8159..afaed44aa 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -52,9 +52,6 @@ #include <svl/ctloptions.hxx> #include <svl/itempool.hxx> -#ifdef IRIX -#include <basic/sbx.hxx> -#endif #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> #include "drawview.hxx" |