summaryrefslogtreecommitdiff
path: root/sfx2/source/control
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/control')
-rw-r--r--sfx2/source/control/querystatus.cxx8
-rw-r--r--sfx2/source/control/sfxstatuslistener.cxx10
-rw-r--r--sfx2/source/control/statcach.cxx4
-rw-r--r--sfx2/source/control/thumbnailviewacc.cxx106
-rw-r--r--sfx2/source/control/thumbnailviewacc.hxx112
-rw-r--r--sfx2/source/control/unoctitm.cxx20
6 files changed, 130 insertions, 130 deletions
diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index 7b1dc9b3da99..cc53a29610bc 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -53,10 +53,10 @@ class SfxQueryStatus_Impl : public ::cppu::WeakImplHelper1< css::frame::XStatusL
SfxItemState QueryState( SfxPoolItem*& pPoolItem );
// 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) throw( ::com::sun::star::uno::RuntimeException, std::exception );
// XStatusListener
- virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception );
private:
SfxQueryStatus_Impl( const SfxQueryStatus& );
@@ -91,14 +91,14 @@ SfxQueryStatus_Impl::~SfxQueryStatus_Impl()
}
void SAL_CALL SfxQueryStatus_Impl::disposing( const EventObject& )
-throw( RuntimeException )
+throw( RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
m_xDispatch.clear();
}
void SAL_CALL SfxQueryStatus_Impl::statusChanged( const FeatureStateEvent& rEvent)
-throw( RuntimeException )
+throw( RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index bfa918017689..eab1359a23d3 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -99,7 +99,7 @@ void SfxStatusListener::ReBind()
}
// new UNO API
-void SAL_CALL SfxStatusListener::dispose() throw( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL SfxStatusListener::dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception )
{
if ( m_xDispatch.is() && !m_aCommand.Complete.isEmpty() )
{
@@ -118,19 +118,19 @@ void SAL_CALL SfxStatusListener::dispose() throw( ::com::sun::star::uno::Runtime
}
void SAL_CALL SfxStatusListener::addEventListener( const Reference< XEventListener >& )
-throw ( RuntimeException )
+throw ( RuntimeException, std::exception )
{
// do nothing - this is a wrapper class which does not support listeners
}
void SAL_CALL SfxStatusListener::removeEventListener( const Reference< XEventListener >& )
-throw ( RuntimeException )
+throw ( RuntimeException, std::exception )
{
// do nothing - this is a wrapper class which does not support listeners
}
void SAL_CALL SfxStatusListener::disposing( const EventObject& Source )
-throw( RuntimeException )
+throw( RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
@@ -141,7 +141,7 @@ throw( RuntimeException )
}
void SAL_CALL SfxStatusListener::statusChanged( const FeatureStateEvent& rEvent)
-throw( RuntimeException )
+throw( RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index 43589bb5e7d6..10247d78a64c 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -69,7 +69,7 @@ BindDispatch_Impl::BindDispatch_Impl( const ::com::sun::star::uno::Reference< ::
aStatus.IsEnabled = sal_True;
}
-void SAL_CALL BindDispatch_Impl::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL BindDispatch_Impl::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
{
if ( xDisp.is() )
{
@@ -78,7 +78,7 @@ void SAL_CALL BindDispatch_Impl::disposing( const ::com::sun::star::lang::EventO
}
}
-void SAL_CALL BindDispatch_Impl::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& rEvent ) throw( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL BindDispatch_Impl::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& rEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
{
aStatus = rEvent;
if ( !pCache )
diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx
index 26f3eacee864..dfc274ba8a25 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -119,14 +119,14 @@ void ThumbnailViewAcc::LoseFocus (void)
}
uno::Reference< accessibility::XAccessibleContext > SAL_CALL ThumbnailViewAcc::getAccessibleContext()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
return this;
}
sal_Int32 SAL_CALL ThumbnailViewAcc::getAccessibleChildCount()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
const SolarMutexGuard aSolarGuard;
ThrowIfDisposed();
@@ -136,7 +136,7 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getAccessibleChildCount()
}
uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAccessibleChild( sal_Int32 i )
- throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+ throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
const SolarMutexGuard aSolarGuard;
@@ -152,7 +152,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAcces
}
uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAccessibleParent()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
const SolarMutexGuard aSolarGuard;
@@ -166,7 +166,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAcces
}
sal_Int32 SAL_CALL ThumbnailViewAcc::getAccessibleIndexInParent()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
const SolarMutexGuard aSolarGuard;
@@ -191,7 +191,7 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getAccessibleIndexInParent()
}
sal_Int16 SAL_CALL ThumbnailViewAcc::getAccessibleRole()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
// #i73746# As the Java Access Bridge (v 2.0.1) uses "managesDescendants"
@@ -202,7 +202,7 @@ sal_Int16 SAL_CALL ThumbnailViewAcc::getAccessibleRole()
}
OUString SAL_CALL ThumbnailViewAcc::getAccessibleDescription()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
const SolarMutexGuard aSolarGuard;
@@ -210,7 +210,7 @@ OUString SAL_CALL ThumbnailViewAcc::getAccessibleDescription()
}
OUString SAL_CALL ThumbnailViewAcc::getAccessibleName()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
const SolarMutexGuard aSolarGuard;
@@ -230,14 +230,14 @@ OUString SAL_CALL ThumbnailViewAcc::getAccessibleName()
}
uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ThumbnailViewAcc::getAccessibleRelationSet()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
return uno::Reference< accessibility::XAccessibleRelationSet >();
}
uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ThumbnailViewAcc::getAccessibleStateSet()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper();
@@ -257,7 +257,7 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ThumbnailViewAcc::
}
lang::Locale SAL_CALL ThumbnailViewAcc::getLocale()
- throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException)
+ throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
const SolarMutexGuard aSolarGuard;
@@ -277,7 +277,7 @@ lang::Locale SAL_CALL ThumbnailViewAcc::getLocale()
}
void SAL_CALL ThumbnailViewAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
::osl::MutexGuard aGuard (m_aMutex);
@@ -301,7 +301,7 @@ void SAL_CALL ThumbnailViewAcc::addAccessibleEventListener( const uno::Reference
}
void SAL_CALL ThumbnailViewAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
::osl::MutexGuard aGuard (m_aMutex);
@@ -317,7 +317,7 @@ void SAL_CALL ThumbnailViewAcc::removeAccessibleEventListener( const uno::Refere
}
sal_Bool SAL_CALL ThumbnailViewAcc::containsPoint( const awt::Point& aPoint )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
const awt::Rectangle aRect( getBounds() );
@@ -328,7 +328,7 @@ sal_Bool SAL_CALL ThumbnailViewAcc::containsPoint( const awt::Point& aPoint )
}
uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAccessibleAtPoint( const awt::Point& aPoint )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
const SolarMutexGuard aSolarGuard;
@@ -350,7 +350,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAcces
}
awt::Rectangle SAL_CALL ThumbnailViewAcc::getBounds()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
const SolarMutexGuard aSolarGuard;
@@ -367,7 +367,7 @@ awt::Rectangle SAL_CALL ThumbnailViewAcc::getBounds()
}
awt::Point SAL_CALL ThumbnailViewAcc::getLocation()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
const awt::Rectangle aRect( getBounds() );
@@ -380,7 +380,7 @@ awt::Point SAL_CALL ThumbnailViewAcc::getLocation()
}
awt::Point SAL_CALL ThumbnailViewAcc::getLocationOnScreen()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
const SolarMutexGuard aSolarGuard;
@@ -394,7 +394,7 @@ awt::Point SAL_CALL ThumbnailViewAcc::getLocationOnScreen()
}
awt::Size SAL_CALL ThumbnailViewAcc::getSize()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
const awt::Rectangle aRect( getBounds() );
@@ -407,7 +407,7 @@ awt::Size SAL_CALL ThumbnailViewAcc::getSize()
}
void SAL_CALL ThumbnailViewAcc::grabFocus()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
const SolarMutexGuard aSolarGuard;
@@ -422,7 +422,7 @@ uno::Any SAL_CALL ThumbnailViewAcc::getAccessibleKeyBinding()
}
sal_Int32 SAL_CALL ThumbnailViewAcc::getForeground( )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor().GetColor();
@@ -430,7 +430,7 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getForeground( )
}
sal_Int32 SAL_CALL ThumbnailViewAcc::getBackground( )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor();
@@ -438,7 +438,7 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getBackground( )
}
void SAL_CALL ThumbnailViewAcc::selectAccessibleChild( sal_Int32 nChildIndex )
- throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+ throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
const SolarMutexGuard aSolarGuard;
@@ -453,7 +453,7 @@ void SAL_CALL ThumbnailViewAcc::selectAccessibleChild( sal_Int32 nChildIndex )
}
sal_Bool SAL_CALL ThumbnailViewAcc::isAccessibleChildSelected( sal_Int32 nChildIndex )
- throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+ throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
const SolarMutexGuard aSolarGuard;
@@ -469,21 +469,21 @@ sal_Bool SAL_CALL ThumbnailViewAcc::isAccessibleChildSelected( sal_Int32 nChildI
}
void SAL_CALL ThumbnailViewAcc::clearAccessibleSelection()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
const SolarMutexGuard aSolarGuard;
}
void SAL_CALL ThumbnailViewAcc::selectAllAccessibleChildren()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
// unsupported due to single selection only
}
sal_Int32 SAL_CALL ThumbnailViewAcc::getSelectedAccessibleChildCount()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
const SolarMutexGuard aSolarGuard;
@@ -501,7 +501,7 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getSelectedAccessibleChildCount()
}
uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
- throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+ throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
const SolarMutexGuard aSolarGuard;
@@ -519,7 +519,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getSelec
}
void SAL_CALL ThumbnailViewAcc::deselectAccessibleChild( sal_Int32 nChildIndex )
- throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+ throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
const SolarMutexGuard aSolarGuard;
@@ -530,7 +530,7 @@ void SAL_CALL ThumbnailViewAcc::deselectAccessibleChild( sal_Int32 nChildIndex )
(void) nChildIndex;
}
-sal_Int64 SAL_CALL ThumbnailViewAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException )
+sal_Int64 SAL_CALL ThumbnailViewAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException, std::exception )
{
sal_Int64 nRet;
@@ -673,25 +673,25 @@ ThumbnailViewItemAcc* ThumbnailViewItemAcc::getImplementation( const uno::Refere
}
uno::Reference< accessibility::XAccessibleContext > SAL_CALL ThumbnailViewItemAcc::getAccessibleContext()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return this;
}
sal_Int32 SAL_CALL ThumbnailViewItemAcc::getAccessibleChildCount()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return 0;
}
uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewItemAcc::getAccessibleChild( sal_Int32 )
- throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+ throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
{
throw lang::IndexOutOfBoundsException();
}
uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewItemAcc::getAccessibleParent()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
const SolarMutexGuard aSolarGuard;
uno::Reference< accessibility::XAccessible > xRet;
@@ -703,7 +703,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewItemAcc::getA
}
sal_Int32 SAL_CALL ThumbnailViewItemAcc::getAccessibleIndexInParent()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
const SolarMutexGuard aSolarGuard;
// The index defaults to -1 to indicate the child does not belong to its
@@ -743,19 +743,19 @@ sal_Int32 SAL_CALL ThumbnailViewItemAcc::getAccessibleIndexInParent()
}
sal_Int16 SAL_CALL ThumbnailViewItemAcc::getAccessibleRole()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return accessibility::AccessibleRole::LIST_ITEM;
}
OUString SAL_CALL ThumbnailViewItemAcc::getAccessibleDescription()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return OUString();
}
OUString SAL_CALL ThumbnailViewItemAcc::getAccessibleName()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
const SolarMutexGuard aSolarGuard;
OUString aRet;
@@ -776,13 +776,13 @@ OUString SAL_CALL ThumbnailViewItemAcc::getAccessibleName()
}
uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ThumbnailViewItemAcc::getAccessibleRelationSet()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return uno::Reference< accessibility::XAccessibleRelationSet >();
}
uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ThumbnailViewItemAcc::getAccessibleStateSet()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
const SolarMutexGuard aSolarGuard;
::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper;
@@ -812,7 +812,7 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ThumbnailViewItemA
}
lang::Locale SAL_CALL ThumbnailViewItemAcc::getLocale()
- throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException)
+ throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception)
{
const SolarMutexGuard aSolarGuard;
const OUString aEmptyStr;
@@ -831,7 +831,7 @@ lang::Locale SAL_CALL ThumbnailViewItemAcc::getLocale()
}
void SAL_CALL ThumbnailViewItemAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
@@ -854,7 +854,7 @@ void SAL_CALL ThumbnailViewItemAcc::addAccessibleEventListener( const uno::Refer
}
void SAL_CALL ThumbnailViewItemAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
@@ -869,7 +869,7 @@ void SAL_CALL ThumbnailViewItemAcc::removeAccessibleEventListener( const uno::Re
}
sal_Bool SAL_CALL ThumbnailViewItemAcc::containsPoint( const awt::Point& aPoint )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
const awt::Rectangle aRect( getBounds() );
const Point aSize( aRect.Width, aRect.Height );
@@ -879,14 +879,14 @@ sal_Bool SAL_CALL ThumbnailViewItemAcc::containsPoint( const awt::Point& aPoint
}
uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewItemAcc::getAccessibleAtPoint( const awt::Point& )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
uno::Reference< accessibility::XAccessible > xRet;
return xRet;
}
awt::Rectangle SAL_CALL ThumbnailViewItemAcc::getBounds()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
const SolarMutexGuard aSolarGuard;
awt::Rectangle aRet;
@@ -909,7 +909,7 @@ awt::Rectangle SAL_CALL ThumbnailViewItemAcc::getBounds()
}
awt::Point SAL_CALL ThumbnailViewItemAcc::getLocation()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
const awt::Rectangle aRect( getBounds() );
awt::Point aRet;
@@ -921,7 +921,7 @@ awt::Point SAL_CALL ThumbnailViewItemAcc::getLocation()
}
awt::Point SAL_CALL ThumbnailViewItemAcc::getLocationOnScreen()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
const SolarMutexGuard aSolarGuard;
awt::Point aRet;
@@ -939,7 +939,7 @@ awt::Point SAL_CALL ThumbnailViewItemAcc::getLocationOnScreen()
}
awt::Size SAL_CALL ThumbnailViewItemAcc::getSize()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
const awt::Rectangle aRect( getBounds() );
awt::Size aRet;
@@ -951,7 +951,7 @@ awt::Size SAL_CALL ThumbnailViewItemAcc::getSize()
}
void SAL_CALL ThumbnailViewItemAcc::grabFocus()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
// nothing to do
}
@@ -963,19 +963,19 @@ uno::Any SAL_CALL ThumbnailViewItemAcc::getAccessibleKeyBinding()
}
sal_Int32 SAL_CALL ThumbnailViewItemAcc::getForeground( )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor().GetColor();
return static_cast<sal_Int32>(nColor);
}
sal_Int32 SAL_CALL ThumbnailViewItemAcc::getBackground( )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return static_cast<sal_Int32>(Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor());
}
-sal_Int64 SAL_CALL ThumbnailViewItemAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException )
+sal_Int64 SAL_CALL ThumbnailViewItemAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException, std::exception )
{
sal_Int64 nRet;
diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx
index 74f9f1401f67..3034889cac45 100644
--- a/sfx2/source/control/thumbnailviewacc.hxx
+++ b/sfx2/source/control/thumbnailviewacc.hxx
@@ -77,55 +77,55 @@ public:
void LoseFocus (void);
// XComponent
- virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception)
{ WeakComponentImplHelperBase::dispose(); }
- virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception)
{ WeakComponentImplHelperBase::addEventListener(xListener); }
- virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception)
{ WeakComponentImplHelperBase::removeEventListener(xListener); }
// XAccessible
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
// XAccessibleEventBroadcaster
- virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
// XAccessibleContext
- virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException);
- virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException);
- virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception);
// XAccessibleComponent
- virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
// XAccessibleSelection
- virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
// XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
private:
::std::vector< ::com::sun::star::uno::Reference<
@@ -200,38 +200,38 @@ public:
public:
// XAccessible
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
// XAccessibleEventBroadcaster
- virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
// XAccessibleContext
- virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException);
- virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException);
- virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception);
// XAccessibleComponent
- virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
// XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
};
#endif // INCLUDED_SFX2_SOURCE_CONTROL_THUMBNAILVIEWACC_HXX
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index da8115692b92..afd5cafa51f0 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -117,7 +117,7 @@ void SfxUnoControllerItem::UnBind()
ReleaseDispatch();
}
-void SAL_CALL SfxUnoControllerItem::statusChanged(const ::com::sun::star::frame::FeatureStateEvent& rEvent) throw ( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL SfxUnoControllerItem::statusChanged(const ::com::sun::star::frame::FeatureStateEvent& rEvent) throw ( ::com::sun::star::uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
DBG_ASSERT( pCtrlItem, "dispatch implementation didn't respect our previous removeStatusListener call!" );
@@ -174,7 +174,7 @@ void SAL_CALL SfxUnoControllerItem::statusChanged(const ::com::sun::star::frame:
}
}
-void SAL_CALL SfxUnoControllerItem::disposing( const ::com::sun::star::lang::EventObject& ) throw ( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL SfxUnoControllerItem::disposing( const ::com::sun::star::lang::EventObject& ) throw ( ::com::sun::star::uno::RuntimeException, std::exception )
{
::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > aRef( (::cppu::OWeakObject*)this, ::com::sun::star::uno::UNO_QUERY );
ReleaseDispatch();
@@ -264,14 +264,14 @@ void SfxStatusDispatcher::ReleaseAll()
aListeners.disposeAndClear( aObject );
}
-void SAL_CALL SfxStatusDispatcher::dispatch( const ::com::sun::star::util::URL&, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& ) throw ( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL SfxStatusDispatcher::dispatch( const ::com::sun::star::util::URL&, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& ) throw ( ::com::sun::star::uno::RuntimeException, std::exception )
{
}
void SAL_CALL SfxStatusDispatcher::dispatchWithNotification(
const ::com::sun::star::util::URL&,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& ) throw( ::com::sun::star::uno::RuntimeException )
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
{
}
@@ -280,7 +280,7 @@ SfxStatusDispatcher::SfxStatusDispatcher()
{
}
-void SAL_CALL SfxStatusDispatcher::addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw ( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL SfxStatusDispatcher::addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw ( ::com::sun::star::uno::RuntimeException, std::exception )
{
aListeners.addInterface( aURL.Complete, aListener );
if ( aURL.Complete.equalsAscii(".uno:LifeTime") )
@@ -294,14 +294,14 @@ void SAL_CALL SfxStatusDispatcher::addStatusListener(const ::com::sun::star::uno
}
}
-void SAL_CALL SfxStatusDispatcher::removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL ) throw ( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL SfxStatusDispatcher::removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL ) throw ( ::com::sun::star::uno::RuntimeException, std::exception )
{
aListeners.removeInterface( aURL.Complete, aListener );
}
// XUnoTunnel
-sal_Int64 SAL_CALL SfxOfficeDispatch::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException)
+sal_Int64 SAL_CALL SfxOfficeDispatch::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception)
{
if ( aIdentifier == impl_getStaticIdentifier() )
return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this ));
@@ -340,7 +340,7 @@ const ::com::sun::star::uno::Sequence< sal_Int8 >& SfxOfficeDispatch::impl_getSt
}
-void SAL_CALL SfxOfficeDispatch::dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw ( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL SfxOfficeDispatch::dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw ( ::com::sun::star::uno::RuntimeException, std::exception )
{
// ControllerItem is the Impl class
if ( pControllerItem )
@@ -362,7 +362,7 @@ void SAL_CALL SfxOfficeDispatch::dispatch( const ::com::sun::star::util::URL& aU
void SAL_CALL SfxOfficeDispatch::dispatchWithNotification( const ::com::sun::star::util::URL& aURL,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) throw( ::com::sun::star::uno::RuntimeException )
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
{
// ControllerItem is the Impl class
if ( pControllerItem )
@@ -377,7 +377,7 @@ void SAL_CALL SfxOfficeDispatch::dispatchWithNotification( const ::com::sun::sta
}
}
-void SAL_CALL SfxOfficeDispatch::addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw ( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL SfxOfficeDispatch::addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw ( ::com::sun::star::uno::RuntimeException, std::exception )
{
GetListeners().addInterface( aURL.Complete, aListener );
if ( pControllerItem )