diff options
Diffstat (limited to 'toolkit/source/controls/dialogcontrol.cxx')
| -rw-r--r-- | toolkit/source/controls/dialogcontrol.cxx | 127 |
1 files changed, 59 insertions, 68 deletions
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index e13026c91413..ba0d503e6231 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -81,7 +81,7 @@ class SimpleNamedThingContainer : public ::cppu::WeakImplHelper< container::XNam ::osl::Mutex m_aMutex; public: // css::container::XNameContainer, XNameReplace, XNameAccess - virtual void SAL_CALL replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override + virtual void SAL_CALL replaceByName( const OUString& aName, const Any& aElement ) override { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) @@ -91,24 +91,24 @@ public: throw IllegalArgumentException(); things[ aName ] = xElement; } - virtual Any SAL_CALL getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override + virtual Any SAL_CALL getByName( const OUString& aName ) override { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) throw NoSuchElementException(); return uno::makeAny( things[ aName ] ); } - virtual Sequence< OUString > SAL_CALL getElementNames( ) throw(RuntimeException, std::exception) override + virtual Sequence< OUString > SAL_CALL getElementNames( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return comphelper::mapKeysToSequence( things ); } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override { ::osl::MutexGuard aGuard( m_aMutex ); return ( things.find( aName ) != things.end() ); } - virtual void SAL_CALL insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) override + virtual void SAL_CALL insertByName( const OUString& aName, const Any& aElement ) override { ::osl::MutexGuard aGuard( m_aMutex ); if ( hasByName( aName ) ) @@ -118,18 +118,18 @@ public: throw IllegalArgumentException(); things[ aName ] = xElement; } - virtual void SAL_CALL removeByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override + virtual void SAL_CALL removeByName( const OUString& aName ) override { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) throw NoSuchElementException(); things.erase( things.find( aName ) ); } - virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception) override + virtual Type SAL_CALL getElementType( ) override { return cppu::UnoType<T>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return ( !things.empty() ); @@ -145,25 +145,23 @@ protected: css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // ::cppu::OPropertySetHelper - void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override; + void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override; public: explicit UnoControlDialogModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlDialogModel( const UnoControlDialogModel& rModel ); UnoControlModel* Clone() const override; // css::beans::XMultiPropertySet - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // css::io::XPersistObject - OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getServiceName() override; // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("stardiv.Toolkit.UnoControlDialogModel"); } - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { auto s(ControlModelContainerBase::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -236,7 +234,7 @@ UnoControlModel* UnoControlDialogModel::Clone() const } -OUString UnoControlDialogModel::getServiceName( ) throw(RuntimeException, std::exception) +OUString UnoControlDialogModel::getServiceName( ) { return OUString("stardiv.vcl.controlmodel.Dialog"); } @@ -275,13 +273,13 @@ Any UnoControlDialogModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const } // XMultiPropertySet -Reference< XPropertySetInfo > UnoControlDialogModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< XPropertySetInfo > UnoControlDialogModel::getPropertySetInfo( ) { static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } -void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) +void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) { ControlModelContainerBase::setFastPropertyValue_NoBroadcast( nHandle, rValue ); try @@ -329,7 +327,7 @@ OUString UnoDialogControl::GetComponentServiceName() return OUString("TabPage"); } -void UnoDialogControl::dispose() throw(RuntimeException, std::exception) +void UnoDialogControl::dispose() { SolarMutexGuard aGuard; @@ -341,12 +339,11 @@ void UnoDialogControl::dispose() throw(RuntimeException, std::exception) void SAL_CALL UnoDialogControl::disposing( const EventObject& Source ) -throw(RuntimeException, std::exception) { ControlContainerBase::disposing( Source ); } -sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException, std::exception) +sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel ) { // #Can we move all the Resource stuff to the ControlContainerBase ? SolarMutexGuard aGuard; @@ -355,7 +352,7 @@ sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel ) return bRet; } -void UnoDialogControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException, std::exception) +void UnoDialogControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) { SolarMutexGuard aGuard; @@ -385,19 +382,16 @@ void UnoDialogControl::createPeer( const Reference< XToolkit > & rxToolkit, cons } OUString UnoDialogControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoDialogControl"); } sal_Bool UnoDialogControl::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> UnoDialogControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<OUString>{ OUString::createFromAscii(szServiceName2_UnoControlDialog), @@ -435,7 +429,7 @@ void UnoDialogControl::PrepareWindowDescriptor( css::awt::WindowDescriptor& rDes } } -void UnoDialogControl::addTopWindowListener( const Reference< XTopWindowListener >& rxListener ) throw (RuntimeException, std::exception) +void UnoDialogControl::addTopWindowListener( const Reference< XTopWindowListener >& rxListener ) { maTopWindowListeners.addInterface( rxListener ); if( getPeer().is() && maTopWindowListeners.getLength() == 1 ) @@ -445,7 +439,7 @@ void UnoDialogControl::addTopWindowListener( const Reference< XTopWindowListener } } -void UnoDialogControl::removeTopWindowListener( const Reference< XTopWindowListener >& rxListener ) throw (RuntimeException, std::exception) +void UnoDialogControl::removeTopWindowListener( const Reference< XTopWindowListener >& rxListener ) { if( getPeer().is() && maTopWindowListeners.getLength() == 1 ) { @@ -455,7 +449,7 @@ void UnoDialogControl::removeTopWindowListener( const Reference< XTopWindowListe maTopWindowListeners.removeInterface( rxListener ); } -void UnoDialogControl::toFront( ) throw (RuntimeException, std::exception) +void UnoDialogControl::toFront( ) { SolarMutexGuard aGuard; if ( getPeer().is() ) @@ -466,7 +460,7 @@ void UnoDialogControl::toFront( ) throw (RuntimeException, std::exception) } } -void UnoDialogControl::toBack( ) throw (RuntimeException, std::exception) +void UnoDialogControl::toBack( ) { SolarMutexGuard aGuard; if ( getPeer().is() ) @@ -477,7 +471,7 @@ void UnoDialogControl::toBack( ) throw (RuntimeException, std::exception) } } -void UnoDialogControl::setMenuBar( const Reference< XMenuBar >& rxMenuBar ) throw (RuntimeException, std::exception) +void UnoDialogControl::setMenuBar( const Reference< XMenuBar >& rxMenuBar ) { SolarMutexGuard aGuard; mxMenuBar = rxMenuBar; @@ -495,7 +489,6 @@ static ::Size ImplMapPixelToAppFont( OutputDevice* pOutDev, const ::Size& aSize } // css::awt::XWindowListener void SAL_CALL UnoDialogControl::windowResized( const css::awt::WindowEvent& e ) -throw (css::uno::RuntimeException, std::exception) { OutputDevice*pOutDev = Application::GetDefaultDevice(); DBG_ASSERT( pOutDev, "Missing Default Device!" ); @@ -536,7 +529,6 @@ throw (css::uno::RuntimeException, std::exception) } void SAL_CALL UnoDialogControl::windowMoved( const css::awt::WindowEvent& e ) -throw (css::uno::RuntimeException, std::exception) { OutputDevice*pOutDev = Application::GetDefaultDevice(); DBG_ASSERT( pOutDev, "Missing Default Device!" ); @@ -561,43 +553,43 @@ throw (css::uno::RuntimeException, std::exception) } } -void SAL_CALL UnoDialogControl::windowShown( const EventObject& e ) throw (RuntimeException, std::exception) +void SAL_CALL UnoDialogControl::windowShown( const EventObject& e ) { (void)e; } -void SAL_CALL UnoDialogControl::windowHidden( const EventObject& e ) throw (RuntimeException, std::exception) +void SAL_CALL UnoDialogControl::windowHidden( const EventObject& e ) { (void)e; } -void SAL_CALL UnoDialogControl::endDialog( ::sal_Int32 i_result ) throw (RuntimeException, std::exception) +void SAL_CALL UnoDialogControl::endDialog( ::sal_Int32 i_result ) { Reference< XDialog2 > xPeerDialog( getPeer(), UNO_QUERY ); if ( xPeerDialog.is() ) xPeerDialog->endDialog( i_result ); } -void SAL_CALL UnoDialogControl::setHelpId( const OUString& i_id ) throw (RuntimeException, std::exception) +void SAL_CALL UnoDialogControl::setHelpId( const OUString& i_id ) { Reference< XDialog2 > xPeerDialog( getPeer(), UNO_QUERY ); if ( xPeerDialog.is() ) xPeerDialog->setHelpId( i_id ); } -void UnoDialogControl::setTitle( const OUString& Title ) throw(RuntimeException, std::exception) +void UnoDialogControl::setTitle( const OUString& Title ) { SolarMutexGuard aGuard; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TITLE ), uno::Any(Title), true ); } -OUString UnoDialogControl::getTitle() throw(RuntimeException, std::exception) +OUString UnoDialogControl::getTitle() { SolarMutexGuard aGuard; return ImplGetPropertyValue_UString( BASEPROPERTY_TITLE ); } -sal_Int16 UnoDialogControl::execute() throw(RuntimeException, std::exception) +sal_Int16 UnoDialogControl::execute() { SolarMutexGuard aGuard; sal_Int16 nDone = -1; @@ -614,7 +606,7 @@ sal_Int16 UnoDialogControl::execute() throw(RuntimeException, std::exception) return nDone; } -void UnoDialogControl::endExecute() throw(RuntimeException, std::exception) +void UnoDialogControl::endExecute() { SolarMutexGuard aGuard; if ( getPeer().is() ) @@ -631,12 +623,11 @@ void UnoDialogControl::endExecute() throw(RuntimeException, std::exception) // XModifyListener void SAL_CALL UnoDialogControl::modified( const lang::EventObject& /*rEvent*/ ) -throw (RuntimeException, std::exception) { ImplUpdateResourceResolver(); } -void UnoDialogControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent >& rEvents ) throw(RuntimeException, std::exception) +void UnoDialogControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent >& rEvents ) { sal_Int32 nLen = rEvents.getLength(); for( sal_Int32 i = 0; i < nLen; i++ ) @@ -680,29 +671,29 @@ UnoMultiPageControl::~UnoMultiPageControl() } // XTabListener -void SAL_CALL UnoMultiPageControl::inserted( SAL_UNUSED_PARAMETER ::sal_Int32 ) throw (RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::inserted( SAL_UNUSED_PARAMETER ::sal_Int32 ) { } -void SAL_CALL UnoMultiPageControl::removed( SAL_UNUSED_PARAMETER ::sal_Int32 ) throw (RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::removed( SAL_UNUSED_PARAMETER ::sal_Int32 ) { } void SAL_CALL UnoMultiPageControl::changed( SAL_UNUSED_PARAMETER ::sal_Int32, - SAL_UNUSED_PARAMETER const Sequence< NamedValue >& ) throw (RuntimeException, std::exception) + SAL_UNUSED_PARAMETER const Sequence< NamedValue >& ) { } -void SAL_CALL UnoMultiPageControl::activated( ::sal_Int32 ID ) throw (RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::activated( ::sal_Int32 ID ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MULTIPAGEVALUE ), uno::makeAny( ID ), false ); } -void SAL_CALL UnoMultiPageControl::deactivated( SAL_UNUSED_PARAMETER ::sal_Int32 ) throw (RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::deactivated( SAL_UNUSED_PARAMETER ::sal_Int32 ) { } -void SAL_CALL UnoMultiPageControl::disposing(const EventObject&) throw (RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::disposing(const EventObject&) { } -void SAL_CALL UnoMultiPageControl::dispose() throw (RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::dispose() { lang::EventObject aEvt; aEvt.Source = static_cast<cppu::OWeakObject*>(this); @@ -711,7 +702,7 @@ void SAL_CALL UnoMultiPageControl::dispose() throw (RuntimeException, std::excep } // css::awt::XSimpleTabController -::sal_Int32 SAL_CALL UnoMultiPageControl::insertTab() throw (RuntimeException, std::exception) +::sal_Int32 SAL_CALL UnoMultiPageControl::insertTab() { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); if ( !xMultiPage.is() ) @@ -719,7 +710,7 @@ void SAL_CALL UnoMultiPageControl::dispose() throw (RuntimeException, std::excep return xMultiPage->insertTab(); } -void SAL_CALL UnoMultiPageControl::removeTab( ::sal_Int32 ID ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::removeTab( ::sal_Int32 ID ) { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); if ( !xMultiPage.is() ) @@ -727,7 +718,7 @@ void SAL_CALL UnoMultiPageControl::removeTab( ::sal_Int32 ID ) throw (IndexOutOf xMultiPage->removeTab( ID ); } -void SAL_CALL UnoMultiPageControl::setTabProps( ::sal_Int32 ID, const Sequence< NamedValue >& Properties ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::setTabProps( ::sal_Int32 ID, const Sequence< NamedValue >& Properties ) { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); if ( !xMultiPage.is() ) @@ -735,7 +726,7 @@ void SAL_CALL UnoMultiPageControl::setTabProps( ::sal_Int32 ID, const Sequence< xMultiPage->setTabProps( ID, Properties ); } -Sequence< NamedValue > SAL_CALL UnoMultiPageControl::getTabProps( ::sal_Int32 ID ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Sequence< NamedValue > SAL_CALL UnoMultiPageControl::getTabProps( ::sal_Int32 ID ) { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); if ( !xMultiPage.is() ) @@ -743,7 +734,7 @@ Sequence< NamedValue > SAL_CALL UnoMultiPageControl::getTabProps( ::sal_Int32 ID return xMultiPage->getTabProps( ID ); } -void SAL_CALL UnoMultiPageControl::activateTab( ::sal_Int32 ID ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::activateTab( ::sal_Int32 ID ) { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); if ( !xMultiPage.is() ) @@ -753,7 +744,7 @@ void SAL_CALL UnoMultiPageControl::activateTab( ::sal_Int32 ID ) throw (IndexOut } -::sal_Int32 SAL_CALL UnoMultiPageControl::getActiveTabID() throw (RuntimeException, std::exception) +::sal_Int32 SAL_CALL UnoMultiPageControl::getActiveTabID() { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); if ( !xMultiPage.is() ) @@ -761,7 +752,7 @@ void SAL_CALL UnoMultiPageControl::activateTab( ::sal_Int32 ID ) throw (IndexOut return xMultiPage->getActiveTabID(); } -void SAL_CALL UnoMultiPageControl::addTabListener( const Reference< XTabListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::addTabListener( const Reference< XTabListener >& Listener ) { maTabListeners.addInterface( Listener ); Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); @@ -769,7 +760,7 @@ void SAL_CALL UnoMultiPageControl::addTabListener( const Reference< XTabListener xMultiPage->addTabListener( &maTabListeners ); } -void SAL_CALL UnoMultiPageControl::removeTabListener( const Reference< XTabListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::removeTabListener( const Reference< XTabListener >& Listener ) { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); if ( xMultiPage.is() && maTabListeners.getLength() == 1 ) @@ -786,7 +777,7 @@ IMPL_XTYPEPROVIDER_START( UnoMultiPageControl ) IMPL_XTYPEPROVIDER_END // uno::XInterface -uno::Any UnoMultiPageControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) +uno::Any UnoMultiPageControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XTabListener* >(this)), (static_cast< awt::XSimpleTabController* >(this)) ); @@ -824,7 +815,7 @@ void UnoMultiPageControl::bindPage( const uno::Reference< awt::XControl >& _rxCo } -void UnoMultiPageControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException, std::exception) +void UnoMultiPageControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) { SolarMutexGuard aSolarGuard; @@ -914,7 +905,7 @@ UnoMultiPageModel::Clone() const return pClone; } -OUString UnoMultiPageModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoMultiPageModel::getServiceName() { return OUString( "com.sun.star.awt.UnoMultiPageModel" ); } @@ -940,13 +931,13 @@ uno::Any UnoMultiPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoMultiPageModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoMultiPageModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } -void UnoMultiPageModel::insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) +void UnoMultiPageModel::insertByName( const OUString& aName, const Any& aElement ) { Reference< XServiceInfo > xInfo; aElement >>= xInfo; @@ -962,7 +953,7 @@ void UnoMultiPageModel::insertByName( const OUString& aName, const Any& aElement } -sal_Bool SAL_CALL UnoMultiPageModel::getGroupControl( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL UnoMultiPageModel::getGroupControl( ) { return true; } @@ -1032,7 +1023,7 @@ UnoPageModel::Clone() const return pClone; } -OUString UnoPageModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoPageModel::getServiceName() { return OUString( "com.sun.star.awt.UnoPageModel" ); } @@ -1058,14 +1049,14 @@ uno::Any UnoPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoPageModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoPageModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } -sal_Bool SAL_CALL UnoPageModel::getGroupControl( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL UnoPageModel::getGroupControl( ) { return false; } @@ -1195,7 +1186,7 @@ UnoFrameModel::Clone() const return pClone; } -OUString UnoFrameModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoFrameModel::getServiceName() { return OUString( "com.sun.star.awt.UnoFrameModel" ); } @@ -1234,7 +1225,7 @@ uno::Any UnoFrameModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoFrameModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoFrameModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; |