summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-06-05 08:16:59 +0200
committerNoel Grandin <noel@peralex.com>2014-06-05 08:17:52 +0200
commit0e507ae031768deceab236a41d1bbe9fb5123cea (patch)
tree34cc1626f1e8fa6d50d6edd88045be6252150f19 /sd
parentdb246b491c1639942d9f952658d33974e9b06201 (diff)
various: remove SAL_THROW macro
Change-Id: I9464179a736b91f5bc32eb5e5e89b3b4e3da3494
Diffstat (limited to 'sd')
-rw-r--r--sd/inc/helper/simplereferencecomponent.hxx2
-rw-r--r--sd/source/helper/simplereferencecomponent.cxx5
2 files changed, 2 insertions, 5 deletions
diff --git a/sd/inc/helper/simplereferencecomponent.hxx b/sd/inc/helper/simplereferencecomponent.hxx
index 77a6df550952..7604145dc133 100644
--- a/sd/inc/helper/simplereferencecomponent.hxx
+++ b/sd/inc/helper/simplereferencecomponent.hxx
@@ -54,7 +54,7 @@ public:
/** see general class documentation
*/
- static void * operator new(std::size_t nSize) SAL_THROW((std::bad_alloc));
+ static void * operator new(std::size_t nSize);
/** see general class documentation
*/
diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx
index e4d0281a3069..d48c62738d80 100644
--- a/sd/source/helper/simplereferencecomponent.cxx
+++ b/sd/source/helper/simplereferencecomponent.cxx
@@ -83,7 +83,6 @@ void SimpleReferenceComponent::disposing()
}
void * SimpleReferenceComponent::operator new(std::size_t nSize)
- SAL_THROW((std::bad_alloc))
{
return ::operator new(nSize);
}
@@ -94,7 +93,6 @@ void * SimpleReferenceComponent::operator new(std::size_t nSize,
rNothrow
#endif
)
- SAL_THROW(())
{
#if defined WNT
return ::operator new(nSize);
@@ -104,7 +102,7 @@ void * SimpleReferenceComponent::operator new(std::size_t nSize,
#endif // WNT
}
-void SimpleReferenceComponent::operator delete(void * pPtr) SAL_THROW(())
+void SimpleReferenceComponent::operator delete(void * pPtr)
{
::operator delete(pPtr);
}
@@ -115,7 +113,6 @@ void SimpleReferenceComponent::operator delete(void * pPtr,
rNothrow
#endif
)
- SAL_THROW(())
{
#if defined WNT
::operator delete(pPtr); // WNT lacks a global nothrow operator delete...