CWS-TOOLING: integrate CWS sb116

63c6c5d7 · Jens-Heiner Rechtien · a05f4353 · e8686219 · 63c6c5d7 · 63c6c5d7
Kaydet (Commit) 63c6c5d7 authored Ock 05, 2010 tarafından Jens-Heiner Rechtien
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

simplereferencecomponent.cxx sd/source/helper/simplereferencecomponent.cxx +1 -1

fubullet.cxx sd/source/ui/func/fubullet.cxx +0 -3

No files found.
--- 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);

--- 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"