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 | 63c6c5d78c2712b824c9194269d13422d4835487 (patch) | |
| tree | 3330b67c7840ead629d6de06887bdaf9dd979b90 | |
| parent | a05f4353081edb5a8e2dd0d4fffac5aa4158ecd3 (diff) | |
| parent | e8686219ade1a44544d8c89246b75b19ab8eb67d (diff) | |
CWS-TOOLING: integrate CWS sb116
Notes
split repo tag: impress_ooo/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 25776e3c420d..2f8bf68dbdf9 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 fac03893a880..63dc54edefa5 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" |