odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx |
14 +++-----
odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx |
2 -
odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx |
2 -
odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx |
2 -
odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx |
4 +-
odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx |
4 +-
odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx |
4 +-
odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx |
4 +-
odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx |
2 -
odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx |
10 +++---
odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx |
10 +++---
odk/examples/cpp/counter/counter.cxx |
4 +-
odk/examples/cpp/custompanel/ctp_factory.cxx |
14 ++++----
odk/examples/cpp/custompanel/ctp_factory.hxx |
14 ++++----
odk/examples/cpp/custompanel/ctp_panel.cxx |
16 +++++-----
odk/examples/cpp/custompanel/ctp_panel.hxx |
16 +++++-----
16 files changed, 59 insertions(+), 63 deletions(-)
New commits:
commit aa4188b8a60a46154657013640c0f160b057fa79
Author: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
AuthorDate: Tue May 7 18:14:53 2024 +0300
Commit: Hossein <hoss...@libreoffice.org>
CommitDate: Sun May 26 14:31:10 2024 +0200
Remove remaining dynamic exception specifications in odk/examples
as begun in
commit ddcc98fa50dd9d86a60dada4daa00f4d95ffe005
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Jul 22 13:41:12 2020 +0200
Remove obsolete dynamic exception specifications from SDK example C++
code
Change-Id: I70a799655f7633e255d80e829f12a88a27a3c2f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167289
Tested-by: Jenkins
Reviewed-by: Hossein <hoss...@libreoffice.org>
diff --git
a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
index 11320c252c34..be2055e9ce99 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
@@ -74,7 +74,7 @@ class MyService1Impl
// other UNO API's in your implementation
Reference< XComponentContext > m_xContext;
public:
- inline MyService1Impl(Reference< XComponentContext > const & xContext)
throw ()
+ inline MyService1Impl(Reference< XComponentContext > const & xContext)
SAL_NOEXCEPT
: m_refcount( 0 ),
m_xContext(xContext)
{}
@@ -83,10 +83,8 @@ public:
// XInterface
virtual Any SAL_CALL queryInterface( Type const & type );
- virtual void SAL_CALL acquire()
- throw ();
- virtual void SAL_CALL release()
- throw ();
+ virtual void SAL_CALL acquire() SAL_NOEXCEPT;
+ virtual void SAL_CALL release() SAL_NOEXCEPT;
// XTypeProvider
virtual Sequence< Type > SAL_CALL getTypes();
virtual Sequence< sal_Int8 > SAL_CALL getImplementationId();
@@ -135,15 +133,13 @@ Any MyService1Impl::queryInterface( Type const & type )
return Any();
}
-void MyService1Impl::acquire()
- throw ()
+void MyService1Impl::acquire() SAL_NOEXCEPT
{
// thread-safe incrementation of reference count
::osl_atomic_increment( &m_refcount );
}
-void MyService1Impl::release()
- throw ()
+void MyService1Impl::release() SAL_NOEXCEPT
{
// thread-safe decrementation of reference count
if (0 == ::osl_atomic_decrement( &m_refcount ))
diff --git
a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
index eecaec5a3db1..7c1648a2ad8d 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
@@ -78,7 +78,7 @@ class MyService2Impl : public ::cppu::WeakImplHelper3<
// other UNO API's in your implementation
Reference< XComponentContext > m_xContext;
public:
- inline MyService2Impl(Reference< XComponentContext > const & xContext)
throw ()
+ inline MyService2Impl(Reference< XComponentContext > const & xContext)
SAL_NOEXCEPT
: m_xContext(xContext)
{}
diff --git
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
index a52cb0c86a41..d76bb84122a5 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
@@ -72,7 +72,7 @@ OConnection::~OConnection()
m_pDriver = NULL;
}
-void SAL_CALL OConnection::release() throw()
+void SAL_CALL OConnection::release() SAL_NOEXCEPT
{
release_ChildImpl();
}
diff --git
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx
index b837cd3bc8ea..2daca07540eb 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx
@@ -114,7 +114,7 @@ namespace connectivity
// OComponentHelper
virtual void SAL_CALL disposing();
// XInterface
- virtual void SAL_CALL release() throw();
+ virtual void SAL_CALL release() SAL_NOEXCEPT;
// XServiceInfo
DECLARE_SERVICE_INFO();
diff --git
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx
index bbd8954036bb..588883f84f9e 100644
---
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx
+++
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx
@@ -66,12 +66,12 @@ OPreparedStatement::~OPreparedStatement()
{
}
-void SAL_CALL OPreparedStatement::acquire() throw()
+void SAL_CALL OPreparedStatement::acquire() SAL_NOEXCEPT
{
OStatement_BASE2::acquire();
}
-void SAL_CALL OPreparedStatement::release() throw()
+void SAL_CALL OPreparedStatement::release() SAL_NOEXCEPT
{
OStatement_BASE2::release();
}
diff --git
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx
index f0a2f205b7d0..596da0d85626 100644
---
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx
+++
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx
@@ -99,8 +99,8 @@ namespace connectivity
//XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type & rType );
- virtual void SAL_CALL acquire() throw();
- virtual void SAL_CALL release() throw();
+ virtual void SAL_CALL acquire() SAL_NOEXCEPT;
+ virtual void SAL_CALL release() SAL_NOEXCEPT;
//XTypeProvider
virtual ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Type > SAL_CALL getTypes( );
diff --git
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
index 97bcca3b7690..1e85337289f2 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
@@ -848,12 +848,12 @@ void OResultSet::getFastPropertyValue(
}
}
-void SAL_CALL OResultSet::acquire() throw()
+void SAL_CALL OResultSet::acquire() SAL_NOEXCEPT
{
OResultSet_BASE::acquire();
}
-void SAL_CALL OResultSet::release() throw()
+void SAL_CALL OResultSet::release() SAL_NOEXCEPT
{
OResultSet_BASE::release();
}
diff --git
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx
index a0fba2b44801..6bebdc49e650 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx
@@ -120,8 +120,8 @@ namespace connectivity
virtual void SAL_CALL disposing();
// XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type & rType );
- virtual void SAL_CALL acquire() throw();
- virtual void SAL_CALL release() throw();
+ virtual void SAL_CALL acquire() SAL_NOEXCEPT;
+ virtual void SAL_CALL release() SAL_NOEXCEPT;
//XTypeProvider
virtual ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Type > SAL_CALL getTypes( );
// XPropertySet
diff --git
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx
index bee89f0ec553..732578a8f287 100644
---
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx
+++
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx
@@ -58,7 +58,7 @@ namespace connectivity
OResultSetMetaData(OConnection* _pConnection) :
m_pConnection(_pConnection){}
/// Avoid ambiguous cast error from the compiler.
- inline operator ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XResultSetMetaData > () throw()
+ inline operator ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XResultSetMetaData > () SAL_NOEXCEPT
{ return this; }
virtual sal_Int32 SAL_CALL getColumnCount( );
diff --git
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
index 01999dafcfde..74926209ad2a 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
@@ -93,7 +93,7 @@ void OStatement_BASE2::disposing()
OStatement_Base::disposing();
}
-void SAL_CALL OStatement_BASE2::release() throw()
+void SAL_CALL OStatement_BASE2::release() SAL_NOEXCEPT
{
release_ChildImpl();
}
@@ -347,22 +347,22 @@ void OStatement_Base::getFastPropertyValue(Any&
rValue,sal_Int32 nHandle) const
IMPLEMENT_SERVICE_INFO(OStatement,"com.sun.star.sdbcx.OStatement","com.sun.star.sdbc.Statement")
-void SAL_CALL OStatement_Base::acquire() throw()
+void SAL_CALL OStatement_Base::acquire() SAL_NOEXCEPT
{
OStatement_BASE::acquire();
}
-void SAL_CALL OStatement_Base::release() throw()
+void SAL_CALL OStatement_Base::release() SAL_NOEXCEPT
{
OStatement_BASE::release();
}
-void SAL_CALL OStatement::acquire() throw()
+void SAL_CALL OStatement::acquire() SAL_NOEXCEPT
{
OStatement_BASE2::acquire();
}
-void SAL_CALL OStatement::release() throw()
+void SAL_CALL OStatement::release() SAL_NOEXCEPT
{
OStatement_BASE2::release();
}
diff --git
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx
index 8781870758b0..f918e38401a8 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx
@@ -104,8 +104,8 @@ namespace connectivity
// OComponentHelper
virtual void SAL_CALL disposing(){OStatement_BASE::disposing();}
// XInterface
- virtual void SAL_CALL release() throw();
- virtual void SAL_CALL acquire() throw();
+ virtual void SAL_CALL release() SAL_NOEXCEPT;
+ virtual void SAL_CALL acquire() SAL_NOEXCEPT;
// XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type & rType );
//XTypeProvider
@@ -145,7 +145,7 @@ namespace connectivity
// OComponentHelper
virtual void SAL_CALL disposing();
// XInterface
- virtual void SAL_CALL release() throw();
+ virtual void SAL_CALL release() SAL_NOEXCEPT;
};
class OStatement : public OStatement_BASE2,
@@ -160,8 +160,8 @@ namespace connectivity
DECLARE_SERVICE_INFO();
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type & rType );
- virtual void SAL_CALL acquire() throw();
- virtual void SAL_CALL release() throw();
+ virtual void SAL_CALL acquire() SAL_NOEXCEPT;
+ virtual void SAL_CALL release() SAL_NOEXCEPT;
// XBatchExecution
virtual void SAL_CALL addBatch( const ::rtl::OUString& sql );
virtual void SAL_CALL clearBatch( );
diff --git a/odk/examples/cpp/counter/counter.cxx
b/odk/examples/cpp/counter/counter.cxx
index 667c04a7057e..811ef7f7df3e 100644
--- a/odk/examples/cpp/counter/counter.cxx
+++ b/odk/examples/cpp/counter/counter.cxx
@@ -82,9 +82,9 @@ public:
{ std::cout << "< MyCounterImpl dtor called >" << std::endl; }
// XInterface implementation
- virtual void SAL_CALL acquire() throw ()
+ virtual void SAL_CALL acquire() SAL_NOEXCEPT
{ ++m_nRefCount; }
- virtual void SAL_CALL release() throw ()
+ virtual void SAL_CALL release() SAL_NOEXCEPT
{ if (! --m_nRefCount) delete this; }
virtual Any SAL_CALL queryInterface( const Type & rType )
{ return cppu::queryInterface(rType,
diff --git a/odk/examples/cpp/custompanel/ctp_factory.cxx
b/odk/examples/cpp/custompanel/ctp_factory.cxx
index e2e29ee0d53b..85b89476d11d 100644
--- a/odk/examples/cpp/custompanel/ctp_factory.cxx
+++ b/odk/examples/cpp/custompanel/ctp_factory.cxx
@@ -49,7 +49,7 @@ namespace sd { namespace colortoolpanel
}
- Reference< XUIElement > SAL_CALL ToolPanelFactory::createUIElement( const
OUString& i_rResourceURL, const Sequence< PropertyValue >& i_rArgs ) throw
(NoSuchElementException, IllegalArgumentException, RuntimeException)
+ Reference< XUIElement > SAL_CALL ToolPanelFactory::createUIElement( const
OUString& i_rResourceURL, const Sequence< PropertyValue >& i_rArgs )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -86,27 +86,27 @@ namespace sd { namespace colortoolpanel
return xUIElement;
}
- OUString SAL_CALL ToolPanelFactory::getImplementationName( ) throw
(RuntimeException)
+ OUString SAL_CALL ToolPanelFactory::getImplementationName( )
{
return getImplementationName_static();
}
- OUString SAL_CALL ToolPanelFactory::getImplementationName_static( ) throw
(RuntimeException)
+ OUString SAL_CALL ToolPanelFactory::getImplementationName_static( )
{
return OUString(
"org.openoffice.comp.example.custompanel.ToolPanelFactory" );
}
- sal_Bool SAL_CALL ToolPanelFactory::supportsService( const OUString&
i_rServiceName ) throw (RuntimeException)
+ sal_Bool SAL_CALL ToolPanelFactory::supportsService( const OUString&
i_rServiceName )
{
return cppu::supportsService(this, i_rServiceName);
}
- Sequence< OUString > SAL_CALL ToolPanelFactory::getSupportedServiceNames()
throw (RuntimeException)
+ Sequence< OUString > SAL_CALL ToolPanelFactory::getSupportedServiceNames()
{
return getSupportedServiceNames_static();
}
- Sequence< OUString > SAL_CALL
ToolPanelFactory::getSupportedServiceNames_static() throw (RuntimeException)
+ Sequence< OUString > SAL_CALL
ToolPanelFactory::getSupportedServiceNames_static()
{
Sequence< OUString > aServiceNames(1);
aServiceNames[0] =
"org.openoffice.example.colorpanel.ToolPanelFactory";
@@ -114,7 +114,7 @@ namespace sd { namespace colortoolpanel
}
- Reference< XInterface > SAL_CALL ToolPanelFactory::Create( const
Reference< XComponentContext >& i_rContext ) throw (RuntimeException)
+ Reference< XInterface > SAL_CALL ToolPanelFactory::Create( const
Reference< XComponentContext >& i_rContext )
{
return *( new ToolPanelFactory( i_rContext ) );
}
diff --git a/odk/examples/cpp/custompanel/ctp_factory.hxx
b/odk/examples/cpp/custompanel/ctp_factory.hxx
index a3aa5ddd87d8..93ea9e3ef797 100644
--- a/odk/examples/cpp/custompanel/ctp_factory.hxx
+++ b/odk/examples/cpp/custompanel/ctp_factory.hxx
@@ -44,17 +44,17 @@ namespace sd { namespace colortoolpanel
~ToolPanelFactory();
// XUIElementFactory
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const OUString&
i_rResourceURL, const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& i_rArgs ) throw
(::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const OUString&
i_rResourceURL, const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& i_rArgs );
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw
(::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName
) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName( );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName
);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( );
// XServiceInfo - static versions
- static OUString SAL_CALL getImplementationName_static( ) throw
(::com::sun::star::uno::RuntimeException);
- static ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames_static( ) throw
(::com::sun::star::uno::RuntimeException);
- static ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > SAL_CALL Create( const
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
i_rContext ) throw (::com::sun::star::uno::RuntimeException);
+ static OUString SAL_CALL getImplementationName_static( );
+ static ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames_static( );
+ static ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > SAL_CALL Create( const
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
i_rContext );
private:
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >
diff --git a/odk/examples/cpp/custompanel/ctp_panel.cxx
b/odk/examples/cpp/custompanel/ctp_panel.cxx
index a6f03e247e75..039b8e7b2ee9 100644
--- a/odk/examples/cpp/custompanel/ctp_panel.cxx
+++ b/odk/examples/cpp/custompanel/ctp_panel.cxx
@@ -122,7 +122,7 @@ namespace sd { namespace colortoolpanel
}
- Reference< XWindow > SAL_CALL SingleColorPanel::getWindow() throw
(RuntimeException)
+ Reference< XWindow > SAL_CALL SingleColorPanel::getWindow()
{
::osl::MutexGuard aGuard( m_aMutex );
if ( !m_xWindow.is() )
@@ -131,7 +131,7 @@ namespace sd { namespace colortoolpanel
}
- Reference< XAccessible > SAL_CALL SingleColorPanel::createAccessible(
const Reference< XAccessible >& i_rParentAccessible ) throw (RuntimeException)
+ Reference< XAccessible > SAL_CALL SingleColorPanel::createAccessible(
const Reference< XAccessible >& i_rParentAccessible )
{
::osl::MutexGuard aGuard( m_aMutex );
if ( !m_xWindow.is() )
@@ -144,7 +144,7 @@ namespace sd { namespace colortoolpanel
}
- void SAL_CALL SingleColorPanel::windowPaint( const PaintEvent& i_rEvent )
throw (RuntimeException)
+ void SAL_CALL SingleColorPanel::windowPaint( const PaintEvent& i_rEvent )
{
try
{
@@ -163,7 +163,7 @@ namespace sd { namespace colortoolpanel
}
- void SAL_CALL SingleColorPanel::disposing( const EventObject& i_rSource )
throw (RuntimeException)
+ void SAL_CALL SingleColorPanel::disposing( const EventObject& i_rSource )
{
(void)i_rSource;
}
@@ -201,26 +201,26 @@ namespace sd { namespace colortoolpanel
}
- Reference< XFrame > SAL_CALL PanelUIElement::getFrame() throw
(RuntimeException)
+ Reference< XFrame > SAL_CALL PanelUIElement::getFrame()
{
// TODO
return NULL;
}
- OUString SAL_CALL PanelUIElement::getResourceURL() throw (RuntimeException)
+ OUString SAL_CALL PanelUIElement::getResourceURL()
{
return m_sResourceURL;
}
- ::sal_Int16 SAL_CALL PanelUIElement::getType() throw (RuntimeException)
+ ::sal_Int16 SAL_CALL PanelUIElement::getType()
{
return UIElementType::TOOLPANEL;
}
- Reference< XInterface > SAL_CALL PanelUIElement::getRealInterface( )
throw (RuntimeException)
+ Reference< XInterface > SAL_CALL PanelUIElement::getRealInterface( )
{
::osl::MutexGuard aGuard( m_aMutex );
if ( !m_xToolPanel.is() )
diff --git a/odk/examples/cpp/custompanel/ctp_panel.hxx
b/odk/examples/cpp/custompanel/ctp_panel.hxx
index c811f24e6fb1..d6b9574a1f5d 100644
--- a/odk/examples/cpp/custompanel/ctp_panel.hxx
+++ b/odk/examples/cpp/custompanel/ctp_panel.hxx
@@ -48,14 +48,14 @@ namespace sd { namespace colortoolpanel
);
// XToolPanel
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindow > SAL_CALL getWindow() throw
(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible > SAL_CALL createAccessible( const
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible
>& i_rParentAccessible ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindow > SAL_CALL getWindow();
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible > SAL_CALL createAccessible( const
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible
>& i_rParentAccessible );
// XPaintListener
- virtual void SAL_CALL windowPaint( const
::com::sun::star::awt::PaintEvent& e ) throw
(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL windowPaint( const
::com::sun::star::awt::PaintEvent& e );
// XEventListener
- virtual void SAL_CALL disposing( const
::com::sun::star::lang::EventObject& Source ) throw
(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL disposing( const
::com::sun::star::lang::EventObject& Source );
// XComponent equivalents
virtual void SAL_CALL disposing();
@@ -82,10 +82,10 @@ namespace sd { namespace colortoolpanel
);
// XUIElement
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw
(::com::sun::star::uno::RuntimeException);
- virtual OUString SAL_CALL getResourceURL() throw
(::com::sun::star::uno::RuntimeException);
- virtual ::sal_Int16 SAL_CALL getType() throw
(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > SAL_CALL getRealInterface( ) throw
(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame > SAL_CALL getFrame();
+ virtual OUString SAL_CALL getResourceURL();
+ virtual ::sal_Int16 SAL_CALL getType();
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > SAL_CALL getRealInterface( );
// OComponentHelper
virtual void SAL_CALL disposing();
