sal/rtl: remove SAL_THROW macro

Change-Id: I70e41f087dbe188f8fc455150480faeae2b426ed

2 files changed, 11 insertions, 14 deletions

diff --git a/sal/cpprt/operators_new_delete.cxx b/sal/cpprt/operators_new_delete.cxx
index 081b95859913..e74cafedffb8 100644
--- a/sal/cpprt/operators_new_delete.cxx
+++ b/sal/cpprt/operators_new_delete.cxx
@@ -33,11 +33,11 @@ struct AllocatorTraits
     typedef char const signature_type[8];
     const signature_type & m_signature;
 
-    explicit AllocatorTraits (signature_type const & s) SAL_THROW(())
+    explicit AllocatorTraits (signature_type const & s)
         : m_signature (s)
     {}
 
-    std::size_t size (std::size_t n) const SAL_THROW(())
+    std::size_t size (std::size_t n) const
     {
         n = std::max(n, std::size_t(1));
 #if OSL_DEBUG_LEVEL > 0
@@ -46,7 +46,7 @@ struct AllocatorTraits
         return n;
     }
 
-    void* init (void * p) const SAL_THROW(())
+    void* init (void * p) const
     {
 #if OSL_DEBUG_LEVEL > 0
         memcpy (p, m_signature, sizeof(signature_type));
@@ -55,7 +55,7 @@ struct AllocatorTraits
         return p;
     }
 
-    void* fini (void * p) const SAL_THROW(())
+    void* fini (void * p) const
     {
 #if OSL_DEBUG_LEVEL > 0
         p = static_cast<char*>(p) - sizeof(signature_type);
@@ -72,7 +72,7 @@ struct VectorTraits : public AllocatorTraits
 {
     static const signature_type g_signature;
 
-    VectorTraits() SAL_THROW(())
+    VectorTraits()
         : AllocatorTraits (g_signature)
     {}
 };
@@ -81,7 +81,7 @@ struct ScalarTraits : public AllocatorTraits
 {
     static const signature_type g_signature;
 
-    ScalarTraits() SAL_THROW(())
+    ScalarTraits()
         : AllocatorTraits (g_signature)
     {}
 };
@@ -101,7 +101,6 @@ static void default_handler (void)
 
 static void* allocate (
     std::size_t n, AllocatorTraits const & rTraits)
-    SAL_THROW((std::bad_alloc))
 {
     n = rTraits.size (n);
     for (;;)
@@ -122,7 +121,6 @@ static void* allocate (
 
 static void* allocate_nothrow (
     std::size_t n, AllocatorTraits const & rTraits)
-    SAL_THROW(())
 {
     try
     {
@@ -135,7 +133,6 @@ static void* allocate_nothrow (
 }
 
 static void deallocate (void * p, AllocatorTraits const & rTraits)
-    SAL_THROW(())
 {
     if (p)
     {
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 86f22c823e8b..c93aa0c5ace9 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -122,10 +122,10 @@ struct rtl_bootstrap_NameValue
     OUString sName;
     OUString sValue;
 
-    inline rtl_bootstrap_NameValue() SAL_THROW( () )
+    inline rtl_bootstrap_NameValue()
         {}
     inline rtl_bootstrap_NameValue(
-        OUString const & name, OUString const & value ) SAL_THROW( () )
+        OUString const & name, OUString const & value )
         : sName( name ),
           sValue( value )
         {}
@@ -316,9 +316,9 @@ struct Bootstrap_Impl
     explicit Bootstrap_Impl (OUString const & rIniName);
     ~Bootstrap_Impl();
 
-    static void * operator new (std::size_t n) SAL_THROW(())
+    static void * operator new (std::size_t n)
         { return rtl_allocateMemory (sal_uInt32(n)); }
-    static void operator delete (void * p , std::size_t) SAL_THROW(())
+    static void operator delete (void * p , std::size_t)
         { rtl_freeMemory (p); }
 
     bool getValue(
@@ -410,7 +410,7 @@ Bootstrap_Impl::~Bootstrap_Impl()
 
 namespace {
 
-Bootstrap_Impl * get_static_bootstrap_handle() SAL_THROW(())
+Bootstrap_Impl * get_static_bootstrap_handle()
 {
     osl::MutexGuard guard( osl::Mutex::getGlobalMutex() );
     static Bootstrap_Impl * s_handle = 0;