diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
| commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
| tree | d4451246461346a425ad6f796e08bf1514cdd942 /vbahelper | |
| parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) | |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'vbahelper')
69 files changed, 830 insertions, 830 deletions
diff --git a/vbahelper/source/msforms/vbabutton.cxx b/vbahelper/source/msforms/vbabutton.cxx index 78c11302267e..9eeb943407ef 100644 --- a/vbahelper/source/msforms/vbabutton.cxx +++ b/vbahelper/source/msforms/vbabutton.cxx @@ -31,7 +31,7 @@ VbaButton::VbaButton( const uno::Reference< XHelperInterface >& xParent, const u // Attributes OUString SAL_CALL -VbaButton::getCaption() throw (css::uno::RuntimeException) +VbaButton::getCaption() throw (css::uno::RuntimeException, std::exception) { OUString Label; m_xProps->getPropertyValue( LABEL ) >>= Label; @@ -39,58 +39,58 @@ VbaButton::getCaption() throw (css::uno::RuntimeException) } void SAL_CALL -VbaButton::setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException) +VbaButton::setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) ); } -sal_Bool SAL_CALL VbaButton::getAutoSize() throw (uno::RuntimeException) +sal_Bool SAL_CALL VbaButton::getAutoSize() throw (uno::RuntimeException, std::exception) { return ScVbaControl::getAutoSize(); } -void SAL_CALL VbaButton::setAutoSize( sal_Bool bAutoSize ) throw (uno::RuntimeException) +void SAL_CALL VbaButton::setAutoSize( sal_Bool bAutoSize ) throw (uno::RuntimeException, std::exception) { ScVbaControl::setAutoSize( bAutoSize ); } -sal_Bool SAL_CALL VbaButton::getLocked() throw (uno::RuntimeException) +sal_Bool SAL_CALL VbaButton::getLocked() throw (uno::RuntimeException, std::exception) { return ScVbaControl::getLocked(); } -void SAL_CALL VbaButton::setLocked( sal_Bool bLocked ) throw (uno::RuntimeException) +void SAL_CALL VbaButton::setLocked( sal_Bool bLocked ) throw (uno::RuntimeException, std::exception) { ScVbaControl::setLocked( bLocked ); } -sal_Bool SAL_CALL VbaButton::getCancel() throw (uno::RuntimeException) +sal_Bool SAL_CALL VbaButton::getCancel() throw (uno::RuntimeException, std::exception) { return sal_False; } -void SAL_CALL VbaButton::setCancel( sal_Bool /*bCancel*/ ) throw (uno::RuntimeException) +void SAL_CALL VbaButton::setCancel( sal_Bool /*bCancel*/ ) throw (uno::RuntimeException, std::exception) { // #STUB } -sal_Bool SAL_CALL VbaButton::getDefault() throw (uno::RuntimeException) +sal_Bool SAL_CALL VbaButton::getDefault() throw (uno::RuntimeException, std::exception) { // #STUB return sal_False; } -void SAL_CALL VbaButton::setDefault( sal_Bool /*bDefault*/ ) throw (uno::RuntimeException) +void SAL_CALL VbaButton::setDefault( sal_Bool /*bDefault*/ ) throw (uno::RuntimeException, std::exception) { // #STUB } -sal_Int32 SAL_CALL VbaButton::getBackColor() throw (uno::RuntimeException) +sal_Int32 SAL_CALL VbaButton::getBackColor() throw (uno::RuntimeException, std::exception) { return ScVbaControl::getBackColor(); } -void SAL_CALL VbaButton::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException) +void SAL_CALL VbaButton::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException, std::exception) { ScVbaControl::setBackColor( nBackColor ); } @@ -105,7 +105,7 @@ void SAL_CALL VbaButton::setForeColor( sal_Int32 /*nForeColor*/ ) throw (uno::Ru // #STUB } -uno::Reference< msforms::XNewFont > SAL_CALL VbaButton::getFont() throw (uno::RuntimeException) +uno::Reference< msforms::XNewFont > SAL_CALL VbaButton::getFont() throw (uno::RuntimeException, std::exception) { return new VbaNewFont( this, mxContext, m_xProps ); } diff --git a/vbahelper/source/msforms/vbabutton.hxx b/vbahelper/source/msforms/vbabutton.hxx index 01f67aadd503..823ad0665334 100644 --- a/vbahelper/source/msforms/vbabutton.hxx +++ b/vbahelper/source/msforms/vbabutton.hxx @@ -31,21 +31,21 @@ class VbaButton : public ButtonImpl_BASE public: VbaButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ); // Attributes - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException); - virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getCancel() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCancel( sal_Bool bCancel ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getDefault() throw (css::uno::RuntimeException); - virtual void SAL_CALL setDefault( sal_Bool bDefault ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException); - virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getCancel() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCancel( sal_Bool bCancel ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getDefault() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDefault( sal_Bool bDefault ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getForeColor() throw (css::uno::RuntimeException); virtual void SAL_CALL setForeColor( sal_Int32 nForeColor ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getLocked() throw (css::uno::RuntimeException); - virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL getLocked() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception); //XHelperInterface virtual OUString getServiceImplName(); virtual css::uno::Sequence<OUString> getServiceNames(); diff --git a/vbahelper/source/msforms/vbacheckbox.cxx b/vbahelper/source/msforms/vbacheckbox.cxx index 63ee9fdd5cf6..577ad0322654 100644 --- a/vbahelper/source/msforms/vbacheckbox.cxx +++ b/vbahelper/source/msforms/vbacheckbox.cxx @@ -33,7 +33,7 @@ ScVbaCheckbox::ScVbaCheckbox( const uno::Reference< ov::XHelperInterface >& xPar // Attributes OUString SAL_CALL -ScVbaCheckbox::getCaption() throw (css::uno::RuntimeException) +ScVbaCheckbox::getCaption() throw (css::uno::RuntimeException, std::exception) { OUString Label; m_xProps->getPropertyValue( LABEL ) >>= Label; @@ -41,13 +41,13 @@ ScVbaCheckbox::getCaption() throw (css::uno::RuntimeException) } void SAL_CALL -ScVbaCheckbox::setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException) +ScVbaCheckbox::setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) ); } uno::Any SAL_CALL -ScVbaCheckbox::getValue() throw (css::uno::RuntimeException) +ScVbaCheckbox::getValue() throw (css::uno::RuntimeException, std::exception) { sal_Int16 nValue = -1; m_xProps->getPropertyValue( STATE ) >>= nValue; @@ -60,7 +60,7 @@ ScVbaCheckbox::getValue() throw (css::uno::RuntimeException) } void SAL_CALL -ScVbaCheckbox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException) +ScVbaCheckbox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException, std::exception) { sal_Int16 nValue = 0; sal_Int16 nOldValue = 0; @@ -80,7 +80,7 @@ ScVbaCheckbox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeExcept fireClickEvent(); } -uno::Reference< msforms::XNewFont > SAL_CALL ScVbaCheckbox::getFont() throw (uno::RuntimeException) +uno::Reference< msforms::XNewFont > SAL_CALL ScVbaCheckbox::getFont() throw (uno::RuntimeException, std::exception) { return new VbaNewFont( this, mxContext, m_xProps ); } @@ -103,32 +103,32 @@ ScVbaCheckbox::getServiceNames() return aServiceNames; } -sal_Int32 SAL_CALL ScVbaCheckbox::getBackColor() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScVbaCheckbox::getBackColor() throw (uno::RuntimeException, std::exception) { return ScVbaControl::getBackColor(); } -void SAL_CALL ScVbaCheckbox::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException) +void SAL_CALL ScVbaCheckbox::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException, std::exception) { ScVbaControl::setBackColor( nBackColor ); } -sal_Bool SAL_CALL ScVbaCheckbox::getAutoSize() throw (uno::RuntimeException) +sal_Bool SAL_CALL ScVbaCheckbox::getAutoSize() throw (uno::RuntimeException, std::exception) { return ScVbaControl::getAutoSize(); } -void SAL_CALL ScVbaCheckbox::setAutoSize( sal_Bool bAutoSize ) throw (uno::RuntimeException) +void SAL_CALL ScVbaCheckbox::setAutoSize( sal_Bool bAutoSize ) throw (uno::RuntimeException, std::exception) { ScVbaControl::setAutoSize( bAutoSize ); } -sal_Bool SAL_CALL ScVbaCheckbox::getLocked() throw (uno::RuntimeException) +sal_Bool SAL_CALL ScVbaCheckbox::getLocked() throw (uno::RuntimeException, std::exception) { return ScVbaControl::getLocked(); } -void SAL_CALL ScVbaCheckbox::setLocked( sal_Bool bLocked ) throw (uno::RuntimeException) +void SAL_CALL ScVbaCheckbox::setLocked( sal_Bool bLocked ) throw (uno::RuntimeException, std::exception) { ScVbaControl::setLocked( bLocked ); } diff --git a/vbahelper/source/msforms/vbacheckbox.hxx b/vbahelper/source/msforms/vbacheckbox.hxx index e22cccb91160..b2eb85525d59 100644 --- a/vbahelper/source/msforms/vbacheckbox.hxx +++ b/vbahelper/source/msforms/vbacheckbox.hxx @@ -31,19 +31,19 @@ class ScVbaCheckbox : public CheckBoxImpl_BASE public: ScVbaCheckbox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ); // Attributes - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException); - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException); - virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException); - virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getLocked() throw (css::uno::RuntimeException); - virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getLocked() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception); // XDefaultProperty - OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return OUString("Value"); } + OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) { return OUString("Value"); } //XHelperInterface virtual OUString getServiceImplName(); virtual css::uno::Sequence<OUString> getServiceNames(); diff --git a/vbahelper/source/msforms/vbacombobox.cxx b/vbahelper/source/msforms/vbacombobox.cxx index 8c5401a4e36c..695f3fe9a1f2 100644 --- a/vbahelper/source/msforms/vbacombobox.cxx +++ b/vbahelper/source/msforms/vbacombobox.cxx @@ -62,13 +62,13 @@ ScVbaComboBox::ScVbaComboBox( const uno::Reference< XHelperInterface >& xParent, // Value, [read] e.g. getValue returns the value of ooo Text propery e.g. the value in // the drop down uno::Any SAL_CALL -ScVbaComboBox::getValue() throw (uno::RuntimeException) +ScVbaComboBox::getValue() throw (uno::RuntimeException, std::exception) { return m_xProps->getPropertyValue( sSourceName ); } void SAL_CALL -ScVbaComboBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException) +ScVbaComboBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException, std::exception) { sal_Int16 nIndex = 0; if( _value >>= nIndex ) @@ -90,7 +90,7 @@ ScVbaComboBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeExcepti } uno::Any SAL_CALL -ScVbaComboBox::getListIndex() throw (uno::RuntimeException) +ScVbaComboBox::getListIndex() throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > sItems; m_xProps->getPropertyValue( ITEMS ) >>= sItems; @@ -117,7 +117,7 @@ ScVbaComboBox::getListIndex() throw (uno::RuntimeException) // Value, [write]e.g. setValue sets the value in the drop down, and if the value is one // of the values in the list then the selection is also set void SAL_CALL -ScVbaComboBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException) +ScVbaComboBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException, std::exception) { // booleans are converted to uppercase strings OUString oldValue = extractStringFromAny( getValue(), OUString(), true ); @@ -138,7 +138,7 @@ ScVbaComboBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException) // see Value OUString SAL_CALL -ScVbaComboBox::getText() throw (uno::RuntimeException) +ScVbaComboBox::getText() throw (uno::RuntimeException, std::exception) { OUString result; getValue() >>= result; @@ -146,109 +146,109 @@ ScVbaComboBox::getText() throw (uno::RuntimeException) } void SAL_CALL -ScVbaComboBox::setText( const OUString& _text ) throw (uno::RuntimeException) +ScVbaComboBox::setText( const OUString& _text ) throw (uno::RuntimeException, std::exception) { setValue( uno::makeAny( _text ) ); // seems the same } // Methods void SAL_CALL -ScVbaComboBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException) +ScVbaComboBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException, std::exception) { mpListHelper->AddItem( pvargItem, pvargIndex ); } void SAL_CALL -ScVbaComboBox::removeItem( const uno::Any& index ) throw (uno::RuntimeException) +ScVbaComboBox::removeItem( const uno::Any& index ) throw (uno::RuntimeException, std::exception) { mpListHelper->removeItem( index ); } void SAL_CALL -ScVbaComboBox::Clear( ) throw (uno::RuntimeException) +ScVbaComboBox::Clear( ) throw (uno::RuntimeException, std::exception) { mpListHelper->Clear(); } void SAL_CALL -ScVbaComboBox::setRowSource( const OUString& _rowsource ) throw (css::uno::RuntimeException) +ScVbaComboBox::setRowSource( const OUString& _rowsource ) throw (css::uno::RuntimeException, std::exception) { ScVbaControl::setRowSource( _rowsource ); mpListHelper->setRowSource( _rowsource ); } sal_Int32 SAL_CALL -ScVbaComboBox::getListCount() throw (uno::RuntimeException) +ScVbaComboBox::getListCount() throw (uno::RuntimeException, std::exception) { return mpListHelper->getListCount(); } uno::Any SAL_CALL -ScVbaComboBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException) +ScVbaComboBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException, std::exception) { return mpListHelper->List( pvargIndex, pvarColumn ); } -sal_Int32 SAL_CALL ScVbaComboBox::getStyle() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScVbaComboBox::getStyle() throw (uno::RuntimeException, std::exception) { return msforms::fmStyle::fmStyleDropDownCombo; } -void SAL_CALL ScVbaComboBox::setStyle( sal_Int32 /*nStyle*/ ) throw (uno::RuntimeException) +void SAL_CALL ScVbaComboBox::setStyle( sal_Int32 /*nStyle*/ ) throw (uno::RuntimeException, std::exception) { } -sal_Int32 SAL_CALL ScVbaComboBox::getDropButtonStyle() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScVbaComboBox::getDropButtonStyle() throw (uno::RuntimeException, std::exception) { return msforms::fmDropButtonStyle::fmDropButtonStyleArrow; } -void SAL_CALL ScVbaComboBox::setDropButtonStyle( sal_Int32 /*nDropButtonStyle*/ ) throw (uno::RuntimeException) +void SAL_CALL ScVbaComboBox::setDropButtonStyle( sal_Int32 /*nDropButtonStyle*/ ) throw (uno::RuntimeException, std::exception) { } -sal_Int32 SAL_CALL ScVbaComboBox::getDragBehavior() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScVbaComboBox::getDragBehavior() throw (uno::RuntimeException, std::exception) { return msforms::fmDragBehavior::fmDragBehaviorDisabled; } -void SAL_CALL ScVbaComboBox::setDragBehavior( sal_Int32 /*nDragBehavior*/ ) throw (uno::RuntimeException) +void SAL_CALL ScVbaComboBox::setDragBehavior( sal_Int32 /*nDragBehavior*/ ) throw (uno::RuntimeException, std::exception) { } -sal_Int32 SAL_CALL ScVbaComboBox::getEnterFieldBehavior() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScVbaComboBox::getEnterFieldBehavior() throw (uno::RuntimeException, std::exception) { return msforms::fmEnterFieldBehavior::fmEnterFieldBehaviorSelectAll; } -void SAL_CALL ScVbaComboBox::setEnterFieldBehavior( sal_Int32 /*nEnterFieldBehavior*/ ) throw (uno::RuntimeException) +void SAL_CALL ScVbaComboBox::setEnterFieldBehavior( sal_Int32 /*nEnterFieldBehavior*/ ) throw (uno::RuntimeException, std::exception) { } -sal_Int32 SAL_CALL ScVbaComboBox::getListStyle() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScVbaComboBox::getListStyle() throw (uno::RuntimeException, std::exception) { return msforms::fmListStyle::fmListStylePlain; } -void SAL_CALL ScVbaComboBox::setListStyle( sal_Int32 /*nListStyle*/ ) throw (uno::RuntimeException) +void SAL_CALL ScVbaComboBox::setListStyle( sal_Int32 /*nListStyle*/ ) throw (uno::RuntimeException, std::exception) { } -sal_Int32 SAL_CALL ScVbaComboBox::getTextAlign() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScVbaComboBox::getTextAlign() throw (uno::RuntimeException, std::exception) { return msforms::fmTextAlign::fmTextAlignLeft; } -void SAL_CALL ScVbaComboBox::setTextAlign( sal_Int32 /*nTextAlign*/ ) throw (uno::RuntimeException) +void SAL_CALL ScVbaComboBox::setTextAlign( sal_Int32 /*nTextAlign*/ ) throw (uno::RuntimeException, std::exception) { } -sal_Int32 SAL_CALL ScVbaComboBox::getTextLength() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScVbaComboBox::getTextLength() throw (uno::RuntimeException, std::exception) { return getText().getLength(); } -uno::Reference< msforms::XNewFont > SAL_CALL ScVbaComboBox::getFont() throw (uno::RuntimeException) +uno::Reference< msforms::XNewFont > SAL_CALL ScVbaComboBox::getFont() throw (uno::RuntimeException, std::exception) { return new VbaNewFont( this, mxContext, m_xProps ); } @@ -259,42 +259,42 @@ ScVbaComboBox::getServiceImplName() return OUString("ScVbaComboBox"); } -sal_Int32 SAL_CALL ScVbaComboBox::getBackColor() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScVbaComboBox::getBackColor() throw (uno::RuntimeException, std::exception) { return ScVbaControl::getBackColor(); } -void SAL_CALL ScVbaComboBox::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException) +void SAL_CALL ScVbaComboBox::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException, std::exception) { ScVbaControl::setBackColor( nBackColor ); } -sal_Bool SAL_CALL ScVbaComboBox::getAutoSize() throw (uno::RuntimeException) +sal_Bool SAL_CALL ScVbaComboBox::getAutoSize() throw (uno::RuntimeException, std::exception) { return ScVbaControl::getAutoSize(); } -void SAL_CALL ScVbaComboBox::setAutoSize( sal_Bool bAutoSize ) throw (uno::RuntimeException) +void SAL_CALL ScVbaComboBox::setAutoSize( sal_Bool bAutoSize ) throw (uno::RuntimeException, std::exception) { ScVbaControl::setAutoSize( bAutoSize ); } -sal_Bool SAL_CALL ScVbaComboBox::getLocked() throw (uno::RuntimeException) +sal_Bool SAL_CALL ScVbaComboBox::getLocked() throw (uno::RuntimeException, std::exception) { return ScVbaControl::getLocked(); } -void SAL_CALL ScVbaComboBox::setLocked( sal_Bool bLocked ) throw (uno::RuntimeException) +void SAL_CALL ScVbaComboBox::setLocked( sal_Bool bLocked ) throw (uno::RuntimeException, std::exception) { ScVbaControl::setLocked( bLocked ); } -OUString SAL_CALL ScVbaComboBox::getLinkedCell() throw (uno::RuntimeException) +OUString SAL_CALL ScVbaComboBox::getLinkedCell() throw (uno::RuntimeException, std::exception) { return ScVbaControl::getControlSource(); } -void SAL_CALL ScVbaComboBox::setLinkedCell( const OUString& _linkedcell ) throw (uno::RuntimeException) +void SAL_CALL ScVbaComboBox::setLinkedCell( const OUString& _linkedcell ) throw (uno::RuntimeException, std::exception) { ScVbaControl::setControlSource( _linkedcell ); } diff --git a/vbahelper/source/msforms/vbacombobox.hxx b/vbahelper/source/msforms/vbacombobox.hxx index e15777200cdd..349cf75234bd 100644 --- a/vbahelper/source/msforms/vbacombobox.hxx +++ b/vbahelper/source/msforms/vbacombobox.hxx @@ -42,46 +42,46 @@ public: ScVbaComboBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ); // Attributes - virtual css::uno::Any SAL_CALL getListIndex() throw (css::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException); - virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException); - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException); - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getStyle() throw (css::uno::RuntimeException); - virtual void SAL_CALL setStyle( sal_Int32 nStyle ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getDropButtonStyle() throw (css::uno::RuntimeException); - virtual void SAL_CALL setDropButtonStyle( sal_Int32 nDropButtonStyle ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getDragBehavior() throw (css::uno::RuntimeException); - virtual void SAL_CALL setDragBehavior( sal_Int32 nDragBehavior ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getEnterFieldBehavior() throw (css::uno::RuntimeException); - virtual void SAL_CALL setEnterFieldBehavior( sal_Int32 nEnterFieldBehavior ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getListStyle() throw (css::uno::RuntimeException); - virtual void SAL_CALL setListStyle( sal_Int32 nListStyle ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getTextAlign() throw (css::uno::RuntimeException); - virtual void SAL_CALL setTextAlign( sal_Int32 nTextAlign ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getTextLength() throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException); - virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException); - virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getLocked() throw (css::uno::RuntimeException); - virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException); - virtual OUString SAL_CALL getLinkedCell() throw (css::uno::RuntimeException); - virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getListIndex() throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setStyle( sal_Int32 nStyle ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDropButtonStyle() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDropButtonStyle( sal_Int32 nDropButtonStyle ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDragBehavior() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDragBehavior( sal_Int32 nDragBehavior ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getEnterFieldBehavior() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setEnterFieldBehavior( sal_Int32 nEnterFieldBehavior ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getListStyle() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setListStyle( sal_Int32 nListStyle ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getTextAlign() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTextAlign( sal_Int32 nTextAlign ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getTextLength() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getLocked() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getLinkedCell() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) throw (css::uno::RuntimeException, std::exception); // Methods - virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException); - virtual void SAL_CALL Clear( ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException); + virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Clear( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException, std::exception); // XControl - virtual void SAL_CALL setRowSource( const OUString& _rowsource ) throw (css::uno::RuntimeException); + virtual void SAL_CALL setRowSource( const OUString& _rowsource ) throw (css::uno::RuntimeException, std::exception); // XDefaultProperty - OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return OUString("Value"); } + OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) { return OUString("Value"); } //XHelperInterface virtual OUString getServiceImplName(); virtual css::uno::Sequence<OUString> getServiceNames(); diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index 4bf6f7e43ce9..5e69f899270a 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -101,7 +101,7 @@ private: public: ScVbaControlListener( ScVbaControl *pTmpControl ); virtual ~ScVbaControlListener(); - virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) throw( uno::RuntimeException ); + virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) throw( uno::RuntimeException, std::exception ); }; ScVbaControlListener::ScVbaControlListener( ScVbaControl *pTmpControl ): pControl( pTmpControl ) @@ -113,7 +113,7 @@ ScVbaControlListener::~ScVbaControlListener() } void SAL_CALL -ScVbaControlListener::disposing( const lang::EventObject& ) throw( uno::RuntimeException ) +ScVbaControlListener::disposing( const lang::EventObject& ) throw( uno::RuntimeException, std::exception ) { if( pControl ) { @@ -174,7 +174,7 @@ void ScVbaControl::removeResouce() throw( uno::RuntimeException ) } //In design model has different behavior -sal_Bool SAL_CALL ScVbaControl::getEnabled() throw (uno::RuntimeException) +sal_Bool SAL_CALL ScVbaControl::getEnabled() throw (uno::RuntimeException, std::exception) { uno::Any aValue = m_xProps->getPropertyValue ( "Enabled" ); sal_Bool bRet = false; @@ -182,14 +182,14 @@ sal_Bool SAL_CALL ScVbaControl::getEnabled() throw (uno::RuntimeException) return bRet; } -void SAL_CALL ScVbaControl::setEnabled( sal_Bool bVisible ) throw (uno::RuntimeException) +void SAL_CALL ScVbaControl::setEnabled( sal_Bool bVisible ) throw (uno::RuntimeException, std::exception) { uno::Any aValue( bVisible ); m_xProps->setPropertyValue( "Enabled" , aValue); } -sal_Bool SAL_CALL ScVbaControl::getVisible() throw (uno::RuntimeException) +sal_Bool SAL_CALL ScVbaControl::getVisible() throw (uno::RuntimeException, std::exception) { sal_Bool bVisible( sal_True ); m_xProps->getPropertyValue ( "EnableVisible" ) >>= bVisible; @@ -206,7 +206,7 @@ sal_Bool SAL_CALL ScVbaControl::getVisible() throw (uno::RuntimeException) return bVisible; } -void SAL_CALL ScVbaControl::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException) +void SAL_CALL ScVbaControl::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException, std::exception) { uno::Any aValue( bVisible ); m_xProps->setPropertyValue( "EnableVisible" , aValue); @@ -217,63 +217,63 @@ void SAL_CALL ScVbaControl::setVisible( sal_Bool bVisible ) throw (uno::RuntimeE xProps->setPropertyValue ( "Visible", aValue ); } } -double SAL_CALL ScVbaControl::getHeight() throw (uno::RuntimeException) +double SAL_CALL ScVbaControl::getHeight() throw (uno::RuntimeException, std::exception) { return mpGeometryHelper->getHeight(); } -void SAL_CALL ScVbaControl::setHeight( double _height ) throw (uno::RuntimeException) +void SAL_CALL ScVbaControl::setHeight( double _height ) throw (uno::RuntimeException, std::exception) { mpGeometryHelper->setHeight( _height ); } -double SAL_CALL ScVbaControl::getWidth() throw (uno::RuntimeException) +double SAL_CALL ScVbaControl::getWidth() throw (uno::RuntimeException, std::exception) { return mpGeometryHelper->getWidth(); } -void SAL_CALL ScVbaControl::setWidth( double _width ) throw (uno::RuntimeException) +void SAL_CALL ScVbaControl::setWidth( double _width ) throw (uno::RuntimeException, std::exception) { mpGeometryHelper->setWidth( _width ); } double SAL_CALL -ScVbaControl::getLeft() throw (uno::RuntimeException) +ScVbaControl::getLeft() throw (uno::RuntimeException, std::exception) { return mpGeometryHelper->getLeft(); } void SAL_CALL -ScVbaControl::setLeft( double _left ) throw (uno::RuntimeException) +ScVbaControl::setLeft( double _left ) throw (uno::RuntimeException, std::exception) { mpGeometryHelper->setLeft( _left ); } double SAL_CALL -ScVbaControl::getTop() throw (uno::RuntimeException) +ScVbaControl::getTop() throw (uno::RuntimeException, std::exception) { return mpGeometryHelper->getTop(); } void SAL_CALL -ScVbaControl::setTop( double _top ) throw (uno::RuntimeException) +ScVbaControl::setTop( double _top ) throw (uno::RuntimeException, std::exception) { mpGeometryHelper->setTop( _top ); } uno::Reference< uno::XInterface > SAL_CALL -ScVbaControl::getObject() throw (uno::RuntimeException) +ScVbaControl::getObject() throw (uno::RuntimeException, std::exception) { uno::Reference< msforms::XControl > xRet( this ); return xRet; } -void SAL_CALL ScVbaControl::SetFocus() throw (uno::RuntimeException) +void SAL_CALL ScVbaControl::SetFocus() throw (uno::RuntimeException, std::exception) { uno::Reference< awt::XWindow > xWin( m_xControl, uno::UNO_QUERY_THROW ); xWin->setFocus(); } void SAL_CALL ScVbaControl::Move( double Left, double Top, const uno::Any& Width, const uno::Any& Height ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { double nWidth = 0.0; double nHeight = 0.0; @@ -289,7 +289,7 @@ void SAL_CALL ScVbaControl::Move( double Left, double Top, const uno::Any& Width } OUString SAL_CALL -ScVbaControl::getControlSource() throw (uno::RuntimeException) +ScVbaControl::getControlSource() throw (uno::RuntimeException, std::exception) { // #FIXME I *hate* having these upstream differences // but this is necessary until I manage to upstream other @@ -316,7 +316,7 @@ ScVbaControl::getControlSource() throw (uno::RuntimeException) } void SAL_CALL -ScVbaControl::setControlSource( const OUString& _controlsource ) throw (uno::RuntimeException) +ScVbaControl::setControlSource( const OUString& _controlsource ) throw (uno::RuntimeException, std::exception) { OUString sEmpty; // afaik this is only relevant for Excel documents ( and we need to set up a @@ -356,7 +356,7 @@ ScVbaControl::setControlSource( const OUString& _controlsource ) throw (uno::Run } OUString SAL_CALL -ScVbaControl::getRowSource() throw (uno::RuntimeException) +ScVbaControl::getRowSource() throw (uno::RuntimeException, std::exception) { OUString sRowSource; uno::Reference< form::binding::XListEntrySink > xListSink( m_xProps, uno::UNO_QUERY ); @@ -381,14 +381,14 @@ ScVbaControl::getRowSource() throw (uno::RuntimeException) } void SAL_CALL -ScVbaControl::setRowSource( const OUString& _rowsource ) throw (uno::RuntimeException) +ScVbaControl::setRowSource( const OUString& _rowsource ) throw (uno::RuntimeException, std::exception) { OUString sEmpty; svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel, m_xProps, sEmpty, _rowsource ); } OUString SAL_CALL -ScVbaControl::getName() throw (uno::RuntimeException) +ScVbaControl::getName() throw (uno::RuntimeException, std::exception) { OUString sName; m_xProps->getPropertyValue( "Name" ) >>= sName; @@ -397,13 +397,13 @@ ScVbaControl::getName() throw (uno::RuntimeException) } void SAL_CALL -ScVbaControl::setName( const OUString& _name ) throw (uno::RuntimeException) +ScVbaControl::setName( const OUString& _name ) throw (uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( "Name" , uno::makeAny( _name ) ); } OUString SAL_CALL -ScVbaControl::getControlTipText() throw (css::uno::RuntimeException) +ScVbaControl::getControlTipText() throw (css::uno::RuntimeException, std::exception) { OUString sName; m_xProps->getPropertyValue( "HelpText" ) >>= sName; @@ -411,19 +411,19 @@ ScVbaControl::getControlTipText() throw (css::uno::RuntimeException) } void SAL_CALL -ScVbaControl::setControlTipText( const OUString& rsToolTip ) throw (css::uno::RuntimeException) +ScVbaControl::setControlTipText( const OUString& rsToolTip ) throw (css::uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( "HelpText" , uno::makeAny( rsToolTip ) ); } OUString SAL_CALL ScVbaControl::getTag() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return m_aControlTag; } void SAL_CALL ScVbaControl::setTag( const OUString& aTag ) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { m_aControlTag = aTag; } @@ -496,7 +496,7 @@ static Pointer lcl_msoPointerToLOPointer( long msoPointerStyle ) } ::sal_Int32 SAL_CALL -ScVbaControl::getMousePointer() throw (::com::sun::star::uno::RuntimeException) +ScVbaControl::getMousePointer() throw (::com::sun::star::uno::RuntimeException, std::exception) { PointerStyle eType = POINTER_ARROW; // default ? Window* pWindow = VCLUnoHelper::GetWindow( getWindowPeer() ); @@ -508,7 +508,7 @@ ScVbaControl::getMousePointer() throw (::com::sun::star::uno::RuntimeException) } void SAL_CALL -ScVbaControl::setMousePointer( ::sal_Int32 _mousepointer ) throw (::com::sun::star::uno::RuntimeException) +ScVbaControl::setMousePointer( ::sal_Int32 _mousepointer ) throw (::com::sun::star::uno::RuntimeException, std::exception) { Window* pWindow = VCLUnoHelper::GetWindow( getWindowPeer() ); if ( pWindow ) @@ -519,7 +519,7 @@ ScVbaControl::setMousePointer( ::sal_Int32 _mousepointer ) throw (::com::sun::st } } -void SAL_CALL ScVbaControl::fireEvent( const script::ScriptEvent& rEvt ) throw (uno::RuntimeException) +void SAL_CALL ScVbaControl::fireEvent( const script::ScriptEvent& rEvt ) throw (uno::RuntimeException, std::exception) { script::ScriptEvent evt( rEvt ); uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); @@ -590,12 +590,12 @@ void ScVbaControl::fireClickEvent() fireEvent( evt ); } -sal_Int32 SAL_CALL ScVbaControl::getTabIndex() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScVbaControl::getTabIndex() throw (uno::RuntimeException, std::exception) { return 1; } -void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 /*nTabIndex*/ ) throw (uno::RuntimeException) +void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 /*nTabIndex*/ ) throw (uno::RuntimeException, std::exception) { } @@ -782,11 +782,11 @@ class ControlProviderImpl : public ControlProvider_BASE uno::Reference< uno::XComponentContext > m_xCtx; public: ControlProviderImpl( const uno::Reference< uno::XComponentContext >& xCtx ) : m_xCtx( xCtx ) {} - virtual uno::Reference< msforms::XControl > SAL_CALL createControl( const uno::Reference< drawing::XControlShape >& xControl, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException); + virtual uno::Reference< msforms::XControl > SAL_CALL createControl( const uno::Reference< drawing::XControlShape >& xControl, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException, std::exception); }; uno::Reference< msforms::XControl > SAL_CALL -ControlProviderImpl::createControl( const uno::Reference< drawing::XControlShape >& xControlShape, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException) +ControlProviderImpl::createControl( const uno::Reference< drawing::XControlShape >& xControlShape, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException, std::exception) { uno::Reference< msforms::XControl > xControlToReturn; if ( xControlShape.is() ) diff --git a/vbahelper/source/msforms/vbacontrol.hxx b/vbahelper/source/msforms/vbacontrol.hxx index ee1f6d29b94f..c4e0ab880180 100644 --- a/vbahelper/source/msforms/vbacontrol.hxx +++ b/vbahelper/source/msforms/vbacontrol.hxx @@ -69,37 +69,37 @@ public: OUString getLibraryAndCodeName() const { return m_sLibraryAndCodeName; } // XControl - virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException); - virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException); - virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException); - virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException); - virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException); - virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException); - virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException); - virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException); - virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException); - virtual double SAL_CALL getTop() throw (css::uno::RuntimeException); - virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException); - virtual void SAL_CALL SetFocus( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL Move( double Left, double Top, const ::com::sun::star::uno::Any& Width, const ::com::sun::star::uno::Any& Height ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL fireEvent( const css::script::ScriptEvent& evt ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception); + virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException, std::exception); + virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException, std::exception); + virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException, std::exception); + virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL SetFocus( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Move( double Left, double Top, const ::com::sun::star::uno::Any& Width, const ::com::sun::star::uno::Any& Height ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL fireEvent( const css::script::ScriptEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getObject() throw (css::uno::RuntimeException); - virtual OUString SAL_CALL getControlSource() throw (css::uno::RuntimeException); - virtual void SAL_CALL setControlSource( const OUString& _controlsource ) throw (css::uno::RuntimeException); - virtual OUString SAL_CALL getRowSource() throw (css::uno::RuntimeException); - virtual void SAL_CALL setRowSource( const OUString& _rowsource ) throw (css::uno::RuntimeException); - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException); - virtual OUString SAL_CALL getControlTipText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setControlTipText( const OUString& ) throw (css::uno::RuntimeException); - virtual OUString SAL_CALL getTag() throw (css::uno::RuntimeException); - virtual void SAL_CALL setTag( const OUString& aTag ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getTabIndex() throw (css::uno::RuntimeException); - virtual void SAL_CALL setTabIndex( sal_Int32 nTabIndex ) throw (css::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getMousePointer() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMousePointer( ::sal_Int32 _mousepointer ) throw (::com::sun::star::uno::RuntimeException); + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getObject() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getControlSource() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setControlSource( const OUString& _controlsource ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getRowSource() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setRowSource( const OUString& _rowsource ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getControlTipText() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setControlTipText( const OUString& ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTag() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTag( const OUString& aTag ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getTabIndex() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTabIndex( sal_Int32 nTabIndex ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getMousePointer() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMousePointer( ::sal_Int32 _mousepointer ) throw (::com::sun::star::uno::RuntimeException, std::exception); //remove resouce because ooo.vba.excel.XControl is a wrapper of com.sun.star.drawing.XControlShape virtual void removeResouce() throw( css::uno::RuntimeException ); virtual ::sal_Int32 SAL_CALL getForeColor() throw (::com::sun::star::uno::RuntimeException); diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx index 038d4fadc1e5..a91916987505 100644 --- a/vbahelper/source/msforms/vbacontrols.cxx +++ b/vbahelper/source/msforms/vbacontrols.cxx @@ -113,42 +113,42 @@ public: // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) { return cppu::UnoType<awt::XControl>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) { return ( !mControls.empty() ); } // XNameAcess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); return getByIndex( mIndices[ aName ] ); } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) { return msNames; } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) { ControlIndexMap::iterator it = mIndices.find( aName ); return it != mIndices.end(); } // XElementAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) { return mControls.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { if ( Index < 0 || Index >= static_cast< sal_Int32 >( mControls.size() ) ) throw lang::IndexOutOfBoundsException(); @@ -186,12 +186,12 @@ public: mfOffsetY( fOffsetY ), nIndex( 0 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if ( nIndex < m_xIndexAccess->getCount() ) { @@ -248,7 +248,7 @@ ScVbaControls::createCollectionObject( const css::uno::Any& aSource ) } void SAL_CALL -ScVbaControls::Move( double cx, double cy ) throw (uno::RuntimeException) +ScVbaControls::Move( double cx, double cy ) throw (uno::RuntimeException, std::exception) { uno::Reference< container::XEnumeration > xEnum( createEnumeration() ); while ( xEnum->hasMoreElements() ) @@ -260,7 +260,7 @@ ScVbaControls::Move( double cx, double cy ) throw (uno::RuntimeException) } uno::Any SAL_CALL ScVbaControls::Add( const uno::Any& Object, const uno::Any& StringKey, const uno::Any& /*Before*/, const uno::Any& /*After*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Any aResult; OUString aComServiceName; @@ -443,7 +443,7 @@ uno::Any SAL_CALL ScVbaControls::Add( const uno::Any& Object, const uno::Any& St } void SAL_CALL ScVbaControls::Remove( const uno::Any& StringKeyOrIndex ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OUString aControlName; sal_Int32 nIndex = -1; diff --git a/vbahelper/source/msforms/vbacontrols.hxx b/vbahelper/source/msforms/vbacontrols.hxx index 103381d4942f..e96b95b6362f 100644 --- a/vbahelper/source/msforms/vbacontrols.hxx +++ b/vbahelper/source/msforms/vbacontrols.hxx @@ -38,9 +38,9 @@ public: const css::uno::Reference< css::frame::XModel >& xModel, double fOffsetX, double fOffsetY ); // XControls - virtual void SAL_CALL Move( double cx, double cy ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Object, const css::uno::Any& StringKey, const css::uno::Any& Before, const css::uno::Any& After ) throw (css::uno::RuntimeException); - virtual void SAL_CALL Remove( const css::uno::Any& StringKeyOrIndex ) throw (css::uno::RuntimeException); + virtual void SAL_CALL Move( double cx, double cy ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Object, const css::uno::Any& StringKey, const css::uno::Any& Before, const css::uno::Any& After ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Remove( const css::uno::Any& StringKeyOrIndex ) throw (css::uno::RuntimeException, std::exception); // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); diff --git a/vbahelper/source/msforms/vbaframe.cxx b/vbahelper/source/msforms/vbaframe.cxx index c7998c3c781b..012ffb88b627 100644 --- a/vbahelper/source/msforms/vbaframe.cxx +++ b/vbahelper/source/msforms/vbaframe.cxx @@ -43,47 +43,47 @@ ScVbaFrame::ScVbaFrame( // XFrame attributes -OUString SAL_CALL ScVbaFrame::getCaption() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaFrame::getCaption() throw (css::uno::RuntimeException, std::exception) { OUString Label; m_xProps->getPropertyValue( LABEL ) >>= Label; return Label; } -void SAL_CALL ScVbaFrame::setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ScVbaFrame::setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) ); } -sal_Int32 SAL_CALL ScVbaFrame::getSpecialEffect() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScVbaFrame::getSpecialEffect() throw (uno::RuntimeException, std::exception) { return msforms::fmSpecialEffect::fmSpecialEffectEtched; } -void SAL_CALL ScVbaFrame::setSpecialEffect( sal_Int32 /*nSpecialEffect*/ ) throw (uno::RuntimeException) +void SAL_CALL ScVbaFrame::setSpecialEffect( sal_Int32 /*nSpecialEffect*/ ) throw (uno::RuntimeException, std::exception) { // #STUB } -sal_Int32 SAL_CALL ScVbaFrame::getBorderStyle() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScVbaFrame::getBorderStyle() throw (uno::RuntimeException, std::exception) { return msforms::fmBorderStyle::fmBorderStyleNone; } -void SAL_CALL ScVbaFrame::setBorderStyle( sal_Int32 /*nBorderStyle*/ ) throw (uno::RuntimeException) +void SAL_CALL ScVbaFrame::setBorderStyle( sal_Int32 /*nBorderStyle*/ ) throw (uno::RuntimeException, std::exception) { // #STUB } -uno::Reference< msforms::XNewFont > SAL_CALL ScVbaFrame::getFont() throw (uno::RuntimeException) +uno::Reference< msforms::XNewFont > SAL_CALL ScVbaFrame::getFont() throw (uno::RuntimeException, std::exception) { return new VbaNewFont( this, mxContext, m_xProps ); } // XFrame methods -uno::Any SAL_CALL ScVbaFrame::Controls( const uno::Any& rIndex ) throw (uno::RuntimeException) +uno::Any SAL_CALL ScVbaFrame::Controls( const uno::Any& rIndex ) throw (uno::RuntimeException, std::exception) { // horizontal anchor of frame children is inside border line (add one unit to compensate border line width) double fOffsetX = mpGeometryHelper->getOffsetX() + getLeft() + 1.0; diff --git a/vbahelper/source/msforms/vbaframe.hxx b/vbahelper/source/msforms/vbaframe.hxx index 66a0cc664f81..59cc7e538682 100644 --- a/vbahelper/source/msforms/vbaframe.hxx +++ b/vbahelper/source/msforms/vbaframe.hxx @@ -40,16 +40,16 @@ public: const css::uno::Reference< css::awt::XControl >& xDialog ); // XFrame attributes - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException); - - virtual sal_Int32 SAL_CALL getSpecialEffect() throw (css::uno::RuntimeException); - virtual void SAL_CALL setSpecialEffect( sal_Int32 nSpecialEffect ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBorderStyle() throw (css::uno::RuntimeException); - virtual void SAL_CALL setBorderStyle( sal_Int32 nBorderStyle ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception); + + virtual sal_Int32 SAL_CALL getSpecialEffect() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setSpecialEffect( sal_Int32 nSpecialEffect ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBorderStyle() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBorderStyle( sal_Int32 nBorderStyle ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception); // XFrame methods - css::uno::Any SAL_CALL Controls( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException); + css::uno::Any SAL_CALL Controls( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception); //XHelperInterface virtual OUString getServiceImplName(); virtual css::uno::Sequence<OUString> getServiceNames(); diff --git a/vbahelper/source/msforms/vbaimage.cxx b/vbahelper/source/msforms/vbaimage.cxx index 3093cbeace30..0a27269eb0fe 100644 --- a/vbahelper/source/msforms/vbaimage.cxx +++ b/vbahelper/source/msforms/vbaimage.cxx @@ -45,12 +45,12 @@ ScVbaImage::getServiceNames() return aServiceNames; } -sal_Int32 SAL_CALL ScVbaImage::getBackColor() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScVbaImage::getBackColor() throw (uno::RuntimeException, std::exception) { return ScVbaControl::getBackColor(); } -void SAL_CALL ScVbaImage::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException) +void SAL_CALL ScVbaImage::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException, std::exception) { ScVbaControl::setBackColor( nBackColor ); } diff --git a/vbahelper/source/msforms/vbaimage.hxx b/vbahelper/source/msforms/vbaimage.hxx index 3d74af0fc697..35bfed4304cc 100644 --- a/vbahelper/source/msforms/vbaimage.hxx +++ b/vbahelper/source/msforms/vbaimage.hxx @@ -30,8 +30,8 @@ class ScVbaImage : public ImageImpl_BASE { public: ScVbaImage( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ); - virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException); - virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException, std::exception); //XHelperInterface virtual OUString getServiceImplName(); virtual css::uno::Sequence<OUString> getServiceNames(); diff --git a/vbahelper/source/msforms/vbalabel.cxx b/vbahelper/source/msforms/vbalabel.cxx index 6a1d78f496f1..71c1bb2bff26 100644 --- a/vbahelper/source/msforms/vbalabel.cxx +++ b/vbahelper/source/msforms/vbalabel.cxx @@ -31,7 +31,7 @@ ScVbaLabel::ScVbaLabel( const css::uno::Reference< XHelperInterface >& xParent, // Attributes OUString SAL_CALL -ScVbaLabel::getCaption() throw (css::uno::RuntimeException) +ScVbaLabel::getCaption() throw (css::uno::RuntimeException, std::exception) { OUString Label; m_xProps->getPropertyValue( LABEL ) >>= Label; @@ -39,18 +39,18 @@ ScVbaLabel::getCaption() throw (css::uno::RuntimeException) } void SAL_CALL -ScVbaLabel::setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException) +ScVbaLabel::setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) ); } uno::Any SAL_CALL -ScVbaLabel::getValue() throw (css::uno::RuntimeException) +ScVbaLabel::getValue() throw (css::uno::RuntimeException, std::exception) { return uno::makeAny( getCaption() ); } void SAL_CALL -ScVbaLabel::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException) +ScVbaLabel::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException, std::exception) { OUString sCaption; _value >>= sCaption; @@ -58,19 +58,19 @@ ScVbaLabel::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::Run } OUString SAL_CALL -ScVbaLabel::getAccelerator() throw (css::uno::RuntimeException) +ScVbaLabel::getAccelerator() throw (css::uno::RuntimeException, std::exception) { // #STUB return OUString(); } void SAL_CALL -ScVbaLabel::setAccelerator( const OUString& /*_accelerator*/ ) throw (::com::sun::star::uno::RuntimeException) +ScVbaLabel::setAccelerator( const OUString& /*_accelerator*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) { // #STUB } -uno::Reference< msforms::XNewFont > SAL_CALL ScVbaLabel::getFont() throw (uno::RuntimeException) +uno::Reference< msforms::XNewFont > SAL_CALL ScVbaLabel::getFont() throw (uno::RuntimeException, std::exception) { return new VbaNewFont( this, mxContext, m_xProps ); } @@ -80,22 +80,22 @@ OUString ScVbaLabel::getServiceImplName() return OUString( "ScVbaLabel" ); } -sal_Int32 SAL_CALL ScVbaLabel::getBackColor() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScVbaLabel::getBackColor() throw (uno::RuntimeException, std::exception) { return ScVbaControl::getBackColor(); } -void SAL_CALL ScVbaLabel::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException) +void SAL_CALL ScVbaLabel::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException, std::exception) { ScVbaControl::setBackColor( nBackColor ); } -sal_Bool SAL_CALL ScVbaLabel::getAutoSize() throw (uno::RuntimeException) +sal_Bool SAL_CALL ScVbaLabel::getAutoSize() throw (uno::RuntimeException, std::exception) { return ScVbaControl::getAutoSize(); } -void SAL_CALL ScVbaLabel::setAutoSize( sal_Bool bAutoSize ) throw (uno::RuntimeException) +void SAL_CALL ScVbaLabel::setAutoSize( sal_Bool bAutoSize ) throw (uno::RuntimeException, std::exception) { ScVbaControl::setAutoSize( bAutoSize ); } diff --git a/vbahelper/source/msforms/vbalabel.hxx b/vbahelper/source/msforms/vbalabel.hxx index 313ab0124142..fc86e8c01725 100644 --- a/vbahelper/source/msforms/vbalabel.hxx +++ b/vbahelper/source/msforms/vbalabel.hxx @@ -32,22 +32,22 @@ class ScVbaLabel : public LabelImpl_BASE public: ScVbaLabel( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ); // Attributes - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException); - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException); - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException); - virtual OUString SAL_CALL getAccelerator() throw (css::uno::RuntimeException); - virtual void SAL_CALL setAccelerator( const OUString& _accelerator ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException); - virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException); - virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccelerator() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setAccelerator( const OUString& _accelerator ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception); //XHelperInterface virtual OUString getServiceImplName(); virtual css::uno::Sequence<OUString> getServiceNames(); // XDefaultProperty - OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return OUString("Value"); } + OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) { return OUString("Value"); } }; #endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBALABEL_HXX diff --git a/vbahelper/source/msforms/vbalistbox.cxx b/vbahelper/source/msforms/vbalistbox.cxx index 41ccb0af21c2..c3fdcf329a05 100644 --- a/vbahelper/source/msforms/vbalistbox.cxx +++ b/vbahelper/source/msforms/vbalistbox.cxx @@ -39,7 +39,7 @@ ScVbaListBox::ScVbaListBox( const uno::Reference< XHelperInterface >& xParent, c // Attributes void SAL_CALL -ScVbaListBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException) +ScVbaListBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException, std::exception) { sal_Int32 nIndex = 0; _value >>= nIndex; @@ -48,7 +48,7 @@ ScVbaListBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeExceptio } uno::Any SAL_CALL -ScVbaListBox::getListIndex() throw (uno::RuntimeException) +ScVbaListBox::getListIndex() throw (uno::RuntimeException, std::exception) { uno::Sequence< sal_Int16 > sSelection; m_xProps->getPropertyValue( SELECTEDITEMS ) >>= sSelection; @@ -58,7 +58,7 @@ ScVbaListBox::getListIndex() throw (uno::RuntimeException) } uno::Any SAL_CALL -ScVbaListBox::getValue() throw (uno::RuntimeException) +ScVbaListBox::getValue() throw (uno::RuntimeException, std::exception) { uno::Sequence< sal_Int16 > sSelection; uno::Sequence< OUString > sItems; @@ -73,7 +73,7 @@ ScVbaListBox::getValue() throw (uno::RuntimeException) } void SAL_CALL -ScVbaListBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException) +ScVbaListBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException, std::exception) { if( getMultiSelect() ) { @@ -106,7 +106,7 @@ ScVbaListBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException) } OUString SAL_CALL -ScVbaListBox::getText() throw (uno::RuntimeException) +ScVbaListBox::getText() throw (uno::RuntimeException, std::exception) { OUString result; getValue() >>= result; @@ -114,13 +114,13 @@ ScVbaListBox::getText() throw (uno::RuntimeException) } void SAL_CALL -ScVbaListBox::setText( const OUString& _text ) throw (uno::RuntimeException) +ScVbaListBox::setText( const OUString& _text ) throw (uno::RuntimeException, std::exception) { setValue( uno::makeAny( _text ) ); // seems the same } sal_Int32 SAL_CALL -ScVbaListBox::getMultiSelect() throw (css::uno::RuntimeException) +ScVbaListBox::getMultiSelect() throw (css::uno::RuntimeException, std::exception) { sal_Bool bMultiSelect = sal_False; m_xProps->getPropertyValue( "MultiSelection" ) >>= bMultiSelect; @@ -129,7 +129,7 @@ ScVbaListBox::getMultiSelect() throw (css::uno::RuntimeException) } void SAL_CALL -ScVbaListBox::setMultiSelect( sal_Int32 _multiselect ) throw (css::uno::RuntimeException) +ScVbaListBox::setMultiSelect( sal_Int32 _multiselect ) throw (css::uno::RuntimeException, std::exception) { sal_Bool bBoolVal = false; switch ( _multiselect ) @@ -150,7 +150,7 @@ ScVbaListBox::setMultiSelect( sal_Int32 _multiselect ) throw (css::uno::RuntimeE css::uno::Any SAL_CALL -ScVbaListBox::Selected( sal_Int32 index ) throw (css::uno::RuntimeException) +ScVbaListBox::Selected( sal_Int32 index ) throw (css::uno::RuntimeException, std::exception) { uno::Sequence< OUString > sList; m_xProps->getPropertyValue( ITEMS ) >>= sList; @@ -166,19 +166,19 @@ ScVbaListBox::Selected( sal_Int32 index ) throw (css::uno::RuntimeException) // Methods void SAL_CALL -ScVbaListBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException) +ScVbaListBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException, std::exception) { mpListHelper->AddItem( pvargItem, pvargIndex ); } void SAL_CALL -ScVbaListBox::removeItem( const uno::Any& index ) throw (uno::RuntimeException) +ScVbaListBox::removeItem( const uno::Any& index ) throw (uno::RuntimeException, std::exception) { mpListHelper->removeItem( index ); } void SAL_CALL -ScVbaListBox::Clear( ) throw (uno::RuntimeException) +ScVbaListBox::Clear( ) throw (uno::RuntimeException, std::exception) { mpListHelper->Clear(); } @@ -257,25 +257,25 @@ ScVbaListBox::getValueEvent() } void SAL_CALL -ScVbaListBox::setRowSource( const OUString& _rowsource ) throw (uno::RuntimeException) +ScVbaListBox::setRowSource( const OUString& _rowsource ) throw (uno::RuntimeException, std::exception) { ScVbaControl::setRowSource( _rowsource ); mpListHelper->setRowSource( _rowsource ); } sal_Int32 SAL_CALL -ScVbaListBox::getListCount() throw (uno::RuntimeException) +ScVbaListBox::getListCount() throw (uno::RuntimeException, std::exception) { return mpListHelper->getListCount(); } uno::Any SAL_CALL -ScVbaListBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException) +ScVbaListBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException, std::exception) { return mpListHelper->List( pvargIndex, pvarColumn ); } -uno::Reference< msforms::XNewFont > SAL_CALL ScVbaListBox::getFont() throw (uno::RuntimeException) +uno::Reference< msforms::XNewFont > SAL_CALL ScVbaListBox::getFont() throw (uno::RuntimeException, std::exception) { return new VbaNewFont( this, mxContext, m_xProps ); } diff --git a/vbahelper/source/msforms/vbalistbox.hxx b/vbahelper/source/msforms/vbalistbox.hxx index 1fc0678e8f07..558d3bb43fc4 100644 --- a/vbahelper/source/msforms/vbalistbox.hxx +++ b/vbahelper/source/msforms/vbalistbox.hxx @@ -45,28 +45,28 @@ public: ScVbaListBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ); // Attributes - virtual css::uno::Any SAL_CALL getListIndex() throw (css::uno::RuntimeException); - virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) throw (css::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException); - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException); - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMultiSelect() throw (css::uno::RuntimeException); - virtual void SAL_CALL setMultiSelect( sal_Int32 _multiselect ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getListIndex() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMultiSelect() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMultiSelect( sal_Int32 _multiselect ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception); // Methods - virtual css::uno::Any SAL_CALL Selected( ::sal_Int32 index ) throw (css::uno::RuntimeException); - virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException); - virtual void SAL_CALL Clear( ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Selected( ::sal_Int32 index ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Clear( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException, std::exception); // XControl - virtual void SAL_CALL setRowSource( const OUString& _rowsource ) throw (css::uno::RuntimeException); + virtual void SAL_CALL setRowSource( const OUString& _rowsource ) throw (css::uno::RuntimeException, std::exception); // XDefaultProperty - OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return OUString("Value"); } + OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) { return OUString("Value"); } //XHelperInterface virtual OUString getServiceImplName(); diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx index 53f3df360eba..fb434765a4cb 100644 --- a/vbahelper/source/msforms/vbamultipage.cxx +++ b/vbahelper/source/msforms/vbamultipage.cxx @@ -33,21 +33,21 @@ class PagesImpl : public PagesImpl_Base sal_Int32 mnPages; public: PagesImpl( sal_Int32 nPages ) : mnPages( nPages ) {} - virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException) { return mnPages; } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, ::uno::RuntimeException) + virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) { return mnPages; } + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, ::uno::RuntimeException, std::exception) { if ( Index < 0 || Index > mnPages ) throw lang::IndexOutOfBoundsException(); return uno::makeAny( uno::Reference< uno::XInterface >() ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException) + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) { // no Pages object yet #FIXME //return cppu::UnoType<msforms::XPage>::get(); return cppu::UnoType<uno::XInterface>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) { return ( mnPages > 0 ); } @@ -70,7 +70,7 @@ ScVbaMultiPage::ScVbaMultiPage( // Attributes sal_Int32 SAL_CALL -ScVbaMultiPage::getValue() throw (css::uno::RuntimeException) +ScVbaMultiPage::getValue() throw (css::uno::RuntimeException, std::exception) { sal_Int32 nValue = 0; m_xProps->getPropertyValue( SVALUE ) >>= nValue; @@ -79,7 +79,7 @@ ScVbaMultiPage::getValue() throw (css::uno::RuntimeException) } void SAL_CALL -ScVbaMultiPage::setValue( const sal_Int32 _value ) throw (::com::sun::star::uno::RuntimeException) +ScVbaMultiPage::setValue( const sal_Int32 _value ) throw (::com::sun::star::uno::RuntimeException, std::exception) { // Openoffice 1 based tab index sal_Int32 nVal = _value + 1; @@ -96,7 +96,7 @@ ScVbaMultiPage::getServiceImplName() } uno::Any SAL_CALL -ScVbaMultiPage::Pages( const uno::Any& index ) throw (uno::RuntimeException) +ScVbaMultiPage::Pages( const uno::Any& index ) throw (uno::RuntimeException, std::exception) { // get the container model uno::Reference< container::XNameContainer > xContainer( m_xProps, uno::UNO_QUERY_THROW ); diff --git a/vbahelper/source/msforms/vbamultipage.hxx b/vbahelper/source/msforms/vbamultipage.hxx index 0dc1737071cd..9ae12984ece6 100644 --- a/vbahelper/source/msforms/vbamultipage.hxx +++ b/vbahelper/source/msforms/vbamultipage.hxx @@ -41,9 +41,9 @@ public: ov::AbstractGeometryAttributes* pGeomHelper); // Attributes - virtual sal_Int32 SAL_CALL getValue() throw (css::uno::RuntimeException); - virtual void SAL_CALL setValue( sal_Int32 _value ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Pages( const css::uno::Any& index ) throw (css::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setValue( sal_Int32 _value ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Pages( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception); //XHelperInterface virtual OUString getServiceImplName(); diff --git a/vbahelper/source/msforms/vbanewfont.cxx b/vbahelper/source/msforms/vbanewfont.cxx index a2e64f5921af..d051c1be2d1f 100644 --- a/vbahelper/source/msforms/vbanewfont.cxx +++ b/vbahelper/source/msforms/vbanewfont.cxx @@ -40,35 +40,35 @@ VbaNewFont::VbaNewFont( // XNewFont attributes -OUString SAL_CALL VbaNewFont::getName() throw (uno::RuntimeException) +OUString SAL_CALL VbaNewFont::getName() throw (uno::RuntimeException, std::exception) { uno::Any aAny = mxProps->getPropertyValue( "FontName" ); return aAny.get< OUString >(); } -void SAL_CALL VbaNewFont::setName( const OUString& rName ) throw (uno::RuntimeException) +void SAL_CALL VbaNewFont::setName( const OUString& rName ) throw (uno::RuntimeException, std::exception) { mxProps->setPropertyValue( "FontName" , uno::Any( rName ) ); } -double SAL_CALL VbaNewFont::getSize() throw (uno::RuntimeException) +double SAL_CALL VbaNewFont::getSize() throw (uno::RuntimeException, std::exception) { uno::Any aAny = mxProps->getPropertyValue( "FontHeight" ); return aAny.get< float >(); } -void SAL_CALL VbaNewFont::setSize( double fSize ) throw (uno::RuntimeException) +void SAL_CALL VbaNewFont::setSize( double fSize ) throw (uno::RuntimeException, std::exception) { mxProps->setPropertyValue( "FontHeight" , uno::Any( static_cast< float >( fSize ) ) ); } -sal_Int16 SAL_CALL VbaNewFont::getCharset() throw (uno::RuntimeException) +sal_Int16 SAL_CALL VbaNewFont::getCharset() throw (uno::RuntimeException, std::exception) { uno::Any aAny = mxProps->getPropertyValue( "FontCharset" ); return rtl_getBestWindowsCharsetFromTextEncoding( static_cast< rtl_TextEncoding >( aAny.get< sal_Int16 >() ) ); } -void SAL_CALL VbaNewFont::setCharset( sal_Int16 nCharset ) throw (uno::RuntimeException) +void SAL_CALL VbaNewFont::setCharset( sal_Int16 nCharset ) throw (uno::RuntimeException, std::exception) { rtl_TextEncoding eFontEnc = RTL_TEXTENCODING_DONTKNOW; if( (0 <= nCharset) && (nCharset <= SAL_MAX_UINT8) ) @@ -78,56 +78,56 @@ void SAL_CALL VbaNewFont::setCharset( sal_Int16 nCharset ) throw (uno::RuntimeEx mxProps->setPropertyValue( "FontCharset" , uno::Any( static_cast< sal_Int16 >( eFontEnc ) ) ); } -sal_Int16 SAL_CALL VbaNewFont::getWeight() throw (uno::RuntimeException) +sal_Int16 SAL_CALL VbaNewFont::getWeight() throw (uno::RuntimeException, std::exception) { return getBold() ? 700 : 400; } -void SAL_CALL VbaNewFont::setWeight( sal_Int16 nWeight ) throw (uno::RuntimeException) +void SAL_CALL VbaNewFont::setWeight( sal_Int16 nWeight ) throw (uno::RuntimeException, std::exception) { setBold( nWeight >= 700 ); } -sal_Bool SAL_CALL VbaNewFont::getBold() throw (uno::RuntimeException) +sal_Bool SAL_CALL VbaNewFont::getBold() throw (uno::RuntimeException, std::exception) { uno::Any aAny = mxProps->getPropertyValue( "FontWeight" ); return aAny.get< float >() > awt::FontWeight::NORMAL; } -void SAL_CALL VbaNewFont::setBold( sal_Bool bBold ) throw (uno::RuntimeException) +void SAL_CALL VbaNewFont::setBold( sal_Bool bBold ) throw (uno::RuntimeException, std::exception) { mxProps->setPropertyValue( "FontWeight" , uno::Any( bBold ? awt::FontWeight::BOLD : awt::FontWeight::NORMAL ) ); } -sal_Bool SAL_CALL VbaNewFont::getItalic() throw (uno::RuntimeException) +sal_Bool SAL_CALL VbaNewFont::getItalic() throw (uno::RuntimeException, std::exception) { uno::Any aAny = mxProps->getPropertyValue( "FontSlant" ); return aAny.get< awt::FontSlant >() != awt::FontSlant_NONE; } -void SAL_CALL VbaNewFont::setItalic( sal_Bool bItalic ) throw (uno::RuntimeException) +void SAL_CALL VbaNewFont::setItalic( sal_Bool bItalic ) throw (uno::RuntimeException, std::exception) { mxProps->setPropertyValue( "FontSlant" , uno::Any( bItalic ? awt::FontSlant_ITALIC : awt::FontSlant_NONE ) ); } -sal_Bool SAL_CALL VbaNewFont::getUnderline() throw (uno::RuntimeException) +sal_Bool SAL_CALL VbaNewFont::getUnderline() throw (uno::RuntimeException, std::exception) { uno::Any aAny = mxProps->getPropertyValue("FontUnderline" ); return aAny.get< sal_Int16 >() != awt::FontUnderline::NONE; } -void SAL_CALL VbaNewFont::setUnderline( sal_Bool bUnderline ) throw (uno::RuntimeException) +void SAL_CALL VbaNewFont::setUnderline( sal_Bool bUnderline ) throw (uno::RuntimeException, std::exception) { mxProps->setPropertyValue("FontUnderline" , uno::Any( bUnderline ? awt::FontUnderline::SINGLE : awt::FontUnderline::NONE ) ); } -sal_Bool SAL_CALL VbaNewFont::getStrikethrough() throw (uno::RuntimeException) +sal_Bool SAL_CALL VbaNewFont::getStrikethrough() throw (uno::RuntimeException, std::exception) { uno::Any aAny = mxProps->getPropertyValue( "FontStrikeout" ); return aAny.get< sal_Int16 >() != awt::FontStrikeout::NONE; } -void SAL_CALL VbaNewFont::setStrikethrough( sal_Bool bStrikethrough ) throw (uno::RuntimeException) +void SAL_CALL VbaNewFont::setStrikethrough( sal_Bool bStrikethrough ) throw (uno::RuntimeException, std::exception) { mxProps->setPropertyValue( "FontStrikeout" ,uno::Any( bStrikethrough ? awt::FontStrikeout::SINGLE : awt::FontStrikeout::NONE ) ); } diff --git a/vbahelper/source/msforms/vbanewfont.hxx b/vbahelper/source/msforms/vbanewfont.hxx index d948604f2d79..8394bc6ca60c 100644 --- a/vbahelper/source/msforms/vbanewfont.hxx +++ b/vbahelper/source/msforms/vbanewfont.hxx @@ -36,22 +36,22 @@ public: const css::uno::Reference< css::beans::XPropertySet >& rxModelProps ) throw (css::uno::RuntimeException); // XNewFont attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException); - virtual double SAL_CALL getSize() throw (css::uno::RuntimeException); - virtual void SAL_CALL setSize( double fSize ) throw (css::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getCharset() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCharset( sal_Int16 nCharset ) throw (css::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getWeight() throw (css::uno::RuntimeException); - virtual void SAL_CALL setWeight( sal_Int16 nWeight ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getBold() throw (css::uno::RuntimeException); - virtual void SAL_CALL setBold( sal_Bool bBold ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getItalic() throw (css::uno::RuntimeException); - virtual void SAL_CALL setItalic( sal_Bool bItalic ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getUnderline() throw (css::uno::RuntimeException); - virtual void SAL_CALL setUnderline( sal_Bool bUnderline ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getStrikethrough() throw (css::uno::RuntimeException); - virtual void SAL_CALL setStrikethrough( sal_Bool bStrikethrough ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException, std::exception); + virtual double SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setSize( double fSize ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getCharset() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCharset( sal_Int16 nCharset ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getWeight() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setWeight( sal_Int16 nWeight ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getBold() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBold( sal_Bool bBold ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getItalic() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setItalic( sal_Bool bItalic ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getUnderline() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setUnderline( sal_Bool bUnderline ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getStrikethrough() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setStrikethrough( sal_Bool bStrikethrough ) throw (css::uno::RuntimeException, std::exception); // XHelperInterface VBAHELPER_DECL_XHELPERINTERFACE diff --git a/vbahelper/source/msforms/vbaprogressbar.cxx b/vbahelper/source/msforms/vbaprogressbar.cxx index 3cea4efe5f9f..23403d22f27f 100644 --- a/vbahelper/source/msforms/vbaprogressbar.cxx +++ b/vbahelper/source/msforms/vbaprogressbar.cxx @@ -31,13 +31,13 @@ ScVbaProgressBar::ScVbaProgressBar( const uno::Reference< ov::XHelperInterface > // Attributes uno::Any SAL_CALL -ScVbaProgressBar::getValue() throw (css::uno::RuntimeException) +ScVbaProgressBar::getValue() throw (css::uno::RuntimeException, std::exception) { return m_xProps->getPropertyValue( SVALUE ); } void SAL_CALL -ScVbaProgressBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException) +ScVbaProgressBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( SVALUE, _value ); } diff --git a/vbahelper/source/msforms/vbaprogressbar.hxx b/vbahelper/source/msforms/vbaprogressbar.hxx index 29938557da75..950880f22380 100644 --- a/vbahelper/source/msforms/vbaprogressbar.hxx +++ b/vbahelper/source/msforms/vbaprogressbar.hxx @@ -34,13 +34,13 @@ class ScVbaProgressBar : public ProgressBarImpl_BASE public: ScVbaProgressBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ); // Attributes - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException); - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception); //XHelperInterface virtual OUString getServiceImplName(); virtual css::uno::Sequence<OUString> getServiceNames(); // XDefaultProperty - OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return OUString("Value"); } + OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) { return OUString("Value"); } }; #endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBAPROGRESSBAR_HXX diff --git a/vbahelper/source/msforms/vbaradiobutton.cxx b/vbahelper/source/msforms/vbaradiobutton.cxx index f15d8175d3d1..6c10827d8b4c 100644 --- a/vbahelper/source/msforms/vbaradiobutton.cxx +++ b/vbahelper/source/msforms/vbaradiobutton.cxx @@ -32,7 +32,7 @@ ScVbaRadioButton::ScVbaRadioButton( const uno::Reference< XHelperInterface >& xP // Attributes OUString SAL_CALL -ScVbaRadioButton::getCaption() throw (css::uno::RuntimeException) +ScVbaRadioButton::getCaption() throw (css::uno::RuntimeException, std::exception) { OUString Label; m_xProps->getPropertyValue( LABEL ) >>= Label; @@ -40,13 +40,13 @@ ScVbaRadioButton::getCaption() throw (css::uno::RuntimeException) } void SAL_CALL -ScVbaRadioButton::setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException) +ScVbaRadioButton::setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) ); } uno::Any SAL_CALL -ScVbaRadioButton::getValue() throw (css::uno::RuntimeException) +ScVbaRadioButton::getValue() throw (css::uno::RuntimeException, std::exception) { sal_Int16 nValue = -1; m_xProps->getPropertyValue( STATE ) >>= nValue; @@ -60,7 +60,7 @@ ScVbaRadioButton::getValue() throw (css::uno::RuntimeException) } void SAL_CALL -ScVbaRadioButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException) +ScVbaRadioButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException, std::exception) { sal_Int16 nValue = 0; sal_Int16 nOldValue = 0; @@ -88,7 +88,7 @@ ScVbaRadioButton::setValue( const uno::Any& _value ) throw (uno::RuntimeExceptio } } -uno::Reference< msforms::XNewFont > SAL_CALL ScVbaRadioButton::getFont() throw (uno::RuntimeException) +uno::Reference< msforms::XNewFont > SAL_CALL ScVbaRadioButton::getFont() throw (uno::RuntimeException, std::exception) { return new VbaNewFont( this, mxContext, m_xProps ); } diff --git a/vbahelper/source/msforms/vbaradiobutton.hxx b/vbahelper/source/msforms/vbaradiobutton.hxx index 22f6955510d2..a3bac9ec11b9 100644 --- a/vbahelper/source/msforms/vbaradiobutton.hxx +++ b/vbahelper/source/msforms/vbaradiobutton.hxx @@ -30,16 +30,16 @@ class ScVbaRadioButton : public RadioButtonImpl_BASE public: ScVbaRadioButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ); // Attributes - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException); - virtual void SAL_CALL setValue(const com::sun::star::uno::Any&) throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setValue(const com::sun::star::uno::Any&) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception); //XHelperInterface virtual OUString getServiceImplName(); virtual css::uno::Sequence<OUString> getServiceNames(); // XDefaultProperty - OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return OUString("Value"); } + OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) { return OUString("Value"); } }; #endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBARADIOBUTTON_HXX diff --git a/vbahelper/source/msforms/vbascrollbar.cxx b/vbahelper/source/msforms/vbascrollbar.cxx index 94def0f3e7f3..43d7a3a83a48 100644 --- a/vbahelper/source/msforms/vbascrollbar.cxx +++ b/vbahelper/source/msforms/vbascrollbar.cxx @@ -35,19 +35,19 @@ ScVbaScrollBar::ScVbaScrollBar( const css::uno::Reference< ov::XHelperInterface // Attributes uno::Any SAL_CALL -ScVbaScrollBar::getValue() throw (css::uno::RuntimeException) +ScVbaScrollBar::getValue() throw (css::uno::RuntimeException, std::exception) { return m_xProps->getPropertyValue( SCROLLVALUE ); } void SAL_CALL -ScVbaScrollBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException) +ScVbaScrollBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( SCROLLVALUE, _value ); } ::sal_Int32 SAL_CALL -ScVbaScrollBar::getMax() throw (uno::RuntimeException) +ScVbaScrollBar::getMax() throw (uno::RuntimeException, std::exception) { sal_Int32 nMax = 0; m_xProps->getPropertyValue( SCROLLMAX ) >>= nMax; @@ -55,13 +55,13 @@ ScVbaScrollBar::getMax() throw (uno::RuntimeException) } void SAL_CALL -ScVbaScrollBar::setMax( sal_Int32 nVal ) throw (uno::RuntimeException) +ScVbaScrollBar::setMax( sal_Int32 nVal ) throw (uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( SCROLLMAX, uno::makeAny( nVal ) ); } ::sal_Int32 SAL_CALL -ScVbaScrollBar::getMin() throw (uno::RuntimeException) +ScVbaScrollBar::getMin() throw (uno::RuntimeException, std::exception) { sal_Int32 nVal = 0; m_xProps->getPropertyValue( SCROLLMIN ) >>= nVal; @@ -69,19 +69,19 @@ ScVbaScrollBar::getMin() throw (uno::RuntimeException) } void SAL_CALL -ScVbaScrollBar::setMin( sal_Int32 nVal ) throw (uno::RuntimeException) +ScVbaScrollBar::setMin( sal_Int32 nVal ) throw (uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( SCROLLMIN, uno::makeAny( nVal ) ); } void SAL_CALL -ScVbaScrollBar::setLargeChange( ::sal_Int32 _largechange ) throw (uno::RuntimeException) +ScVbaScrollBar::setLargeChange( ::sal_Int32 _largechange ) throw (uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( LARGECHANGE, uno::makeAny( _largechange ) ); } ::sal_Int32 SAL_CALL -ScVbaScrollBar::getLargeChange() throw (uno::RuntimeException) +ScVbaScrollBar::getLargeChange() throw (uno::RuntimeException, std::exception) { sal_Int32 nVal = 0; m_xProps->getPropertyValue( LARGECHANGE ) >>= nVal; @@ -89,7 +89,7 @@ ScVbaScrollBar::getLargeChange() throw (uno::RuntimeException) } ::sal_Int32 SAL_CALL -ScVbaScrollBar::getSmallChange() throw (uno::RuntimeException) +ScVbaScrollBar::getSmallChange() throw (uno::RuntimeException, std::exception) { sal_Int32 nSmallChange = 0; m_xProps->getPropertyValue( SMALLCHANGE ) >>= nSmallChange; @@ -97,7 +97,7 @@ ScVbaScrollBar::getSmallChange() throw (uno::RuntimeException) } void SAL_CALL -ScVbaScrollBar::setSmallChange( ::sal_Int32 _smallchange ) throw (uno::RuntimeException) +ScVbaScrollBar::setSmallChange( ::sal_Int32 _smallchange ) throw (uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( SMALLCHANGE, uno::makeAny( _smallchange ) ); } diff --git a/vbahelper/source/msforms/vbascrollbar.hxx b/vbahelper/source/msforms/vbascrollbar.hxx index dc7399ede69b..8a0e63c311ec 100644 --- a/vbahelper/source/msforms/vbascrollbar.hxx +++ b/vbahelper/source/msforms/vbascrollbar.hxx @@ -33,16 +33,16 @@ class ScVbaScrollBar : public ScrollBarImpl_BASE public: ScVbaScrollBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ); // Attributes - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException); - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getMax() throw (css::uno::RuntimeException); - virtual void SAL_CALL setMax( ::sal_Int32 _max ) throw (css::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getMin() throw (css::uno::RuntimeException); - virtual void SAL_CALL setMin( ::sal_Int32 _min ) throw (css::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getLargeChange() throw (css::uno::RuntimeException); - virtual void SAL_CALL setLargeChange( ::sal_Int32 _largechange ) throw (css::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getSmallChange() throw (css::uno::RuntimeException); - virtual void SAL_CALL setSmallChange( ::sal_Int32 _smallchange ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getMax() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMax( ::sal_Int32 _max ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getMin() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMin( ::sal_Int32 _min ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getLargeChange() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setLargeChange( ::sal_Int32 _largechange ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getSmallChange() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setSmallChange( ::sal_Int32 _smallchange ) throw (css::uno::RuntimeException, std::exception); //XHelperInterface diff --git a/vbahelper/source/msforms/vbaspinbutton.cxx b/vbahelper/source/msforms/vbaspinbutton.cxx index 9ee85daca545..648e320d2141 100644 --- a/vbahelper/source/msforms/vbaspinbutton.cxx +++ b/vbahelper/source/msforms/vbaspinbutton.cxx @@ -33,19 +33,19 @@ ScVbaSpinButton::ScVbaSpinButton( const css::uno::Reference< ov::XHelperInterfa // Attributes uno::Any SAL_CALL -ScVbaSpinButton::getValue() throw (css::uno::RuntimeException) +ScVbaSpinButton::getValue() throw (css::uno::RuntimeException, std::exception) { return m_xProps->getPropertyValue( SPINVALUE ); } void SAL_CALL -ScVbaSpinButton::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException) +ScVbaSpinButton::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( SPINVALUE, _value ); } ::sal_Int32 SAL_CALL -ScVbaSpinButton::getMax() throw (uno::RuntimeException) +ScVbaSpinButton::getMax() throw (uno::RuntimeException, std::exception) { sal_Int32 nMax = 0; m_xProps->getPropertyValue( SPINMAX ) >>= nMax; @@ -53,13 +53,13 @@ ScVbaSpinButton::getMax() throw (uno::RuntimeException) } void SAL_CALL -ScVbaSpinButton::setMax( sal_Int32 nVal ) throw (uno::RuntimeException) +ScVbaSpinButton::setMax( sal_Int32 nVal ) throw (uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( SPINMAX, uno::makeAny( nVal ) ); } ::sal_Int32 SAL_CALL -ScVbaSpinButton::getMin() throw (uno::RuntimeException) +ScVbaSpinButton::getMin() throw (uno::RuntimeException, std::exception) { sal_Int32 nVal = 0; m_xProps->getPropertyValue( SPINMIN ) >>= nVal; @@ -67,7 +67,7 @@ ScVbaSpinButton::getMin() throw (uno::RuntimeException) } void SAL_CALL -ScVbaSpinButton::setMin( sal_Int32 nVal ) throw (uno::RuntimeException) +ScVbaSpinButton::setMin( sal_Int32 nVal ) throw (uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( SPINMIN, uno::makeAny( nVal ) ); } diff --git a/vbahelper/source/msforms/vbaspinbutton.hxx b/vbahelper/source/msforms/vbaspinbutton.hxx index b1ee6a792215..a003a7c44bef 100644 --- a/vbahelper/source/msforms/vbaspinbutton.hxx +++ b/vbahelper/source/msforms/vbaspinbutton.hxx @@ -31,12 +31,12 @@ class ScVbaSpinButton : public SpinButtonImpl_BASE public: ScVbaSpinButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ); // Attributes - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException); - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getMax() throw (css::uno::RuntimeException); - virtual void SAL_CALL setMax( ::sal_Int32 _max ) throw (css::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getMin() throw (css::uno::RuntimeException); - virtual void SAL_CALL setMin( ::sal_Int32 _min ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getMax() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMax( ::sal_Int32 _max ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getMin() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMin( ::sal_Int32 _min ) throw (css::uno::RuntimeException, std::exception); //XHelperInterface virtual OUString getServiceImplName(); diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.cxx b/vbahelper/source/msforms/vbasystemaxcontrol.cxx index 9ae1c0f0e7ed..a0fd441cb955 100644 --- a/vbahelper/source/msforms/vbasystemaxcontrol.cxx +++ b/vbahelper/source/msforms/vbasystemaxcontrol.cxx @@ -30,42 +30,42 @@ VbaSystemAXControl::VbaSystemAXControl( const uno::Reference< ov::XHelperInterf uno::Reference< beans::XIntrospectionAccess > SAL_CALL VbaSystemAXControl::getIntrospection() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return m_xControlInvocation->getIntrospection(); } uno::Any SAL_CALL VbaSystemAXControl::invoke( const OUString& aFunctionName, const uno::Sequence< uno::Any >& aParams, uno::Sequence< ::sal_Int16 >& aOutParamIndex, uno::Sequence< uno::Any >& aOutParam ) - throw ( lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException ) + throw ( lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception ) { return m_xControlInvocation->invoke( aFunctionName, aParams, aOutParamIndex, aOutParam ); } void SAL_CALL VbaSystemAXControl::setValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw ( beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException ) + throw ( beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception ) { m_xControlInvocation->setValue( aPropertyName, aValue ); } uno::Any SAL_CALL VbaSystemAXControl::getValue( const OUString& aPropertyName ) - throw ( beans::UnknownPropertyException, uno::RuntimeException ) + throw ( beans::UnknownPropertyException, uno::RuntimeException, std::exception ) { return m_xControlInvocation->getValue( aPropertyName ); } ::sal_Bool SAL_CALL VbaSystemAXControl::hasMethod( const OUString& aName ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return m_xControlInvocation->hasMethod( aName ); } ::sal_Bool SAL_CALL VbaSystemAXControl::hasProperty( const OUString& aName ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return m_xControlInvocation->hasProperty( aName ); } diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.hxx b/vbahelper/source/msforms/vbasystemaxcontrol.hxx index d538efdcd68d..80ca570ab779 100644 --- a/vbahelper/source/msforms/vbasystemaxcontrol.hxx +++ b/vbahelper/source/msforms/vbasystemaxcontrol.hxx @@ -35,12 +35,12 @@ public: VbaSystemAXControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ); // XInvocation - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw ( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< ::sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException ); - virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw ( ::com::sun::star::uno::RuntimeException ); - virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw ( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< ::sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); //XHelperInterface virtual OUString getServiceImplName(); diff --git a/vbahelper/source/msforms/vbatextbox.cxx b/vbahelper/source/msforms/vbatextbox.cxx index f61087ed7d1b..5d8ee56a5ee2 100644 --- a/vbahelper/source/msforms/vbatextbox.cxx +++ b/vbahelper/source/msforms/vbatextbox.cxx @@ -32,13 +32,13 @@ ScVbaTextBox::ScVbaTextBox( const uno::Reference< ov::XHelperInterface >& xParen // Attributes uno::Any SAL_CALL -ScVbaTextBox::getValue() throw (css::uno::RuntimeException) +ScVbaTextBox::getValue() throw (css::uno::RuntimeException, std::exception) { return uno::makeAny( getText() ); } void SAL_CALL -ScVbaTextBox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException) +ScVbaTextBox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException, std::exception) { // booleans are converted to uppercase strings OUString sVal = extractStringFromAny( _value, true ); @@ -47,7 +47,7 @@ ScVbaTextBox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeExcepti //getString() will cause some imfo lose. OUString SAL_CALL -ScVbaTextBox::getText() throw (css::uno::RuntimeException) +ScVbaTextBox::getText() throw (css::uno::RuntimeException, std::exception) { uno::Any aValue; aValue = m_xProps->getPropertyValue( "Text" ); @@ -57,7 +57,7 @@ ScVbaTextBox::getText() throw (css::uno::RuntimeException) } void SAL_CALL -ScVbaTextBox::setText( const OUString& _text ) throw (css::uno::RuntimeException) +ScVbaTextBox::setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) { OUString oldText( getText() ); if ( !mbDialog ) @@ -72,7 +72,7 @@ ScVbaTextBox::setText( const OUString& _text ) throw (css::uno::RuntimeException } sal_Int32 SAL_CALL -ScVbaTextBox::getMaxLength() throw (css::uno::RuntimeException) +ScVbaTextBox::getMaxLength() throw (css::uno::RuntimeException, std::exception) { uno::Any aValue; aValue = m_xProps->getPropertyValue( "MaxTextLen" ); @@ -82,7 +82,7 @@ ScVbaTextBox::getMaxLength() throw (css::uno::RuntimeException) } void SAL_CALL -ScVbaTextBox::setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException) +ScVbaTextBox::setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException, std::exception) { sal_Int16 nTmp( _maxlength ); uno::Any aValue( nTmp ); @@ -90,7 +90,7 @@ ScVbaTextBox::setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeExcep } sal_Bool SAL_CALL -ScVbaTextBox::getMultiline() throw (css::uno::RuntimeException) +ScVbaTextBox::getMultiline() throw (css::uno::RuntimeException, std::exception) { uno::Any aValue; aValue = m_xProps->getPropertyValue( "MultiLine" ); @@ -100,68 +100,68 @@ ScVbaTextBox::getMultiline() throw (css::uno::RuntimeException) } void SAL_CALL -ScVbaTextBox::setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException) +ScVbaTextBox::setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException, std::exception) { uno::Any aValue( _multiline ); m_xProps->setPropertyValue( "MultiLine" , aValue); } -sal_Int32 SAL_CALL ScVbaTextBox::getSpecialEffect() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScVbaTextBox::getSpecialEffect() throw (uno::RuntimeException, std::exception) { return msforms::fmSpecialEffect::fmSpecialEffectSunken; } -void SAL_CALL ScVbaTextBox::setSpecialEffect( sal_Int32 /*nSpecialEffect*/ ) throw (uno::RuntimeException) +void SAL_CALL ScVbaTextBox::setSpecialEffect( sal_Int32 /*nSpecialEffect*/ ) throw (uno::RuntimeException, std::exception) { // #STUB } -sal_Int32 SAL_CALL ScVbaTextBox::getBorderStyle() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScVbaTextBox::getBorderStyle() throw (uno::RuntimeException, std::exception) { return msforms::fmBorderStyle::fmBorderStyleNone; } -void SAL_CALL ScVbaTextBox::setBorderStyle( sal_Int32 /*nBorderStyle*/ ) throw (uno::RuntimeException) +void SAL_CALL ScVbaTextBox::setBorderStyle( sal_Int32 /*nBorderStyle*/ ) throw (uno::RuntimeException, std::exception) { // #STUB } -sal_Int32 SAL_CALL ScVbaTextBox::getTextLength() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScVbaTextBox::getTextLength() throw (uno::RuntimeException, std::exception) { return getText().getLength(); } -uno::Reference< msforms::XNewFont > SAL_CALL ScVbaTextBox::getFont() throw (uno::RuntimeException) +uno::Reference< msforms::XNewFont > SAL_CALL ScVbaTextBox::getFont() throw (uno::RuntimeException, std::exception) { return new VbaNewFont( this, mxContext, m_xProps ); } -sal_Int32 SAL_CALL ScVbaTextBox::getBackColor() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScVbaTextBox::getBackColor() throw (uno::RuntimeException, std::exception) { return ScVbaControl::getBackColor(); } -void SAL_CALL ScVbaTextBox::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException) +void SAL_CALL ScVbaTextBox::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException, std::exception) { ScVbaControl::setBackColor( nBackColor ); } -sal_Bool SAL_CALL ScVbaTextBox::getAutoSize() throw (uno::RuntimeException) +sal_Bool SAL_CALL ScVbaTextBox::getAutoSize() throw (uno::RuntimeException, std::exception) { return ScVbaControl::getAutoSize(); } -void SAL_CALL ScVbaTextBox::setAutoSize( sal_Bool bAutoSize ) throw (uno::RuntimeException) +void SAL_CALL ScVbaTextBox::setAutoSize( sal_Bool bAutoSize ) throw (uno::RuntimeException, std::exception) { ScVbaControl::setAutoSize( bAutoSize ); } -sal_Bool SAL_CALL ScVbaTextBox::getLocked() throw (uno::RuntimeException) +sal_Bool SAL_CALL ScVbaTextBox::getLocked() throw (uno::RuntimeException, std::exception) { return ScVbaControl::getLocked(); } -void SAL_CALL ScVbaTextBox::setLocked( sal_Bool bLocked ) throw (uno::RuntimeException) +void SAL_CALL ScVbaTextBox::setLocked( sal_Bool bLocked ) throw (uno::RuntimeException, std::exception) { ScVbaControl::setLocked( bLocked ); } diff --git a/vbahelper/source/msforms/vbatextbox.hxx b/vbahelper/source/msforms/vbatextbox.hxx index 586132ca0c31..3df5010a6b08 100644 --- a/vbahelper/source/msforms/vbatextbox.hxx +++ b/vbahelper/source/msforms/vbatextbox.hxx @@ -33,29 +33,29 @@ class ScVbaTextBox : public TextBoxImpl_BASE public: ScVbaTextBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, bool bDialog = false ); // Attributes - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException); - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException); - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxLength() throw (css::uno::RuntimeException); - virtual void SAL_CALL setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getMultiline() throw (css::uno::RuntimeException); - virtual void SAL_CALL setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSpecialEffect() throw (css::uno::RuntimeException); - virtual void SAL_CALL setSpecialEffect( sal_Int32 nSpecialEffect ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBorderStyle() throw (css::uno::RuntimeException); - virtual void SAL_CALL setBorderStyle( sal_Int32 nBorderStyle ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getTextLength() throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException); - virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException); - virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getLocked() throw (css::uno::RuntimeException); - virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxLength() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getMultiline() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSpecialEffect() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setSpecialEffect( sal_Int32 nSpecialEffect ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBorderStyle() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBorderStyle( sal_Int32 nBorderStyle ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getTextLength() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getLocked() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception); // XDefaultProperty - OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return OUString("Value"); } + OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) { return OUString("Value"); } //XHelperInterface virtual OUString getServiceImplName(); virtual css::uno::Sequence<OUString> getServiceNames(); diff --git a/vbahelper/source/msforms/vbatogglebutton.cxx b/vbahelper/source/msforms/vbatogglebutton.cxx index ce9c007ea5ad..b974b20e43b5 100644 --- a/vbahelper/source/msforms/vbatogglebutton.cxx +++ b/vbahelper/source/msforms/vbatogglebutton.cxx @@ -40,7 +40,7 @@ ScVbaToggleButton::~ScVbaToggleButton() // Attributes OUString SAL_CALL -ScVbaToggleButton::getCaption() throw (css::uno::RuntimeException) +ScVbaToggleButton::getCaption() throw (css::uno::RuntimeException, std::exception) { OUString Label; m_xProps->getPropertyValue( LABEL ) >>= Label; @@ -48,13 +48,13 @@ ScVbaToggleButton::getCaption() throw (css::uno::RuntimeException) } void SAL_CALL -ScVbaToggleButton::setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException) +ScVbaToggleButton::setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) ); } uno::Any SAL_CALL -ScVbaToggleButton::getValue() throw (uno::RuntimeException) +ScVbaToggleButton::getValue() throw (uno::RuntimeException, std::exception) { sal_Int16 nState = 0; m_xProps->getPropertyValue( STATE ) >>= nState; @@ -63,7 +63,7 @@ ScVbaToggleButton::getValue() throw (uno::RuntimeException) void SAL_CALL -ScVbaToggleButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException) +ScVbaToggleButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException, std::exception) { sal_Int16 nState = 0; if ( ! ( _value >>= nState ) ) @@ -79,44 +79,44 @@ ScVbaToggleButton::setValue( const uno::Any& _value ) throw (uno::RuntimeExcepti m_xProps->setPropertyValue( STATE, uno::makeAny( nState ) ); } -sal_Bool SAL_CALL ScVbaToggleButton::getAutoSize() throw (uno::RuntimeException) +sal_Bool SAL_CALL ScVbaToggleButton::getAutoSize() throw (uno::RuntimeException, std::exception) { return ScVbaControl::getAutoSize(); } -void SAL_CALL ScVbaToggleButton::setAutoSize( sal_Bool bAutoSize ) throw (uno::RuntimeException) +void SAL_CALL ScVbaToggleButton::setAutoSize( sal_Bool bAutoSize ) throw (uno::RuntimeException, std::exception) { ScVbaControl::setAutoSize( bAutoSize ); } -sal_Bool SAL_CALL ScVbaToggleButton::getCancel() throw (uno::RuntimeException) +sal_Bool SAL_CALL ScVbaToggleButton::getCancel() throw (uno::RuntimeException, std::exception) { // #STUB return sal_False; } -void SAL_CALL ScVbaToggleButton::setCancel( sal_Bool /*bCancel*/ ) throw (uno::RuntimeException) +void SAL_CALL ScVbaToggleButton::setCancel( sal_Bool /*bCancel*/ ) throw (uno::RuntimeException, std::exception) { // #STUB } -sal_Bool SAL_CALL ScVbaToggleButton::getDefault() throw (uno::RuntimeException) +sal_Bool SAL_CALL ScVbaToggleButton::getDefault() throw (uno::RuntimeException, std::exception) { // #STUB return sal_False; } -void SAL_CALL ScVbaToggleButton::setDefault( sal_Bool /*bDefault*/ ) throw (uno::RuntimeException) +void SAL_CALL ScVbaToggleButton::setDefault( sal_Bool /*bDefault*/ ) throw (uno::RuntimeException, std::exception) { // #STUB } -sal_Int32 SAL_CALL ScVbaToggleButton::getBackColor() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScVbaToggleButton::getBackColor() throw (uno::RuntimeException, std::exception) { return ScVbaControl::getBackColor(); } -void SAL_CALL ScVbaToggleButton::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException) +void SAL_CALL ScVbaToggleButton::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException, std::exception) { ScVbaControl::setBackColor( nBackColor ); } @@ -132,17 +132,17 @@ void SAL_CALL ScVbaToggleButton::setForeColor( sal_Int32 /*nForeColor*/ ) throw // #STUB } -uno::Reference< msforms::XNewFont > SAL_CALL ScVbaToggleButton::getFont() throw (uno::RuntimeException) +uno::Reference< msforms::XNewFont > SAL_CALL ScVbaToggleButton::getFont() throw (uno::RuntimeException, std::exception) { return new VbaNewFont( this, mxContext, m_xProps ); } -sal_Bool SAL_CALL ScVbaToggleButton::getLocked() throw (uno::RuntimeException) +sal_Bool SAL_CALL ScVbaToggleButton::getLocked() throw (uno::RuntimeException, std::exception) { return ScVbaControl::getLocked(); } -void SAL_CALL ScVbaToggleButton::setLocked( sal_Bool bLocked ) throw (uno::RuntimeException) +void SAL_CALL ScVbaToggleButton::setLocked( sal_Bool bLocked ) throw (uno::RuntimeException, std::exception) { ScVbaControl::setLocked( bLocked ); } diff --git a/vbahelper/source/msforms/vbatogglebutton.hxx b/vbahelper/source/msforms/vbatogglebutton.hxx index 97b6e1ae657e..7c9202d60375 100644 --- a/vbahelper/source/msforms/vbatogglebutton.hxx +++ b/vbahelper/source/msforms/vbatogglebutton.hxx @@ -33,28 +33,28 @@ public: ScVbaToggleButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ); ~ScVbaToggleButton(); // Attributes - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException); - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException); - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException); - virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getCancel() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCancel( sal_Bool bCancel ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getDefault() throw (css::uno::RuntimeException); - virtual void SAL_CALL setDefault( sal_Bool bDefault ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException); - virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getCancel() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCancel( sal_Bool bCancel ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getDefault() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDefault( sal_Bool bDefault ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getForeColor() throw (css::uno::RuntimeException); virtual void SAL_CALL setForeColor( sal_Int32 nForeColor ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getLocked() throw (css::uno::RuntimeException); - virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL getLocked() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception); //XHelperInterface virtual OUString getServiceImplName(); virtual css::uno::Sequence<OUString> getServiceNames(); // XDefaultProperty - OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return OUString("Value"); } + OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) { return OUString("Value"); } }; #endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBATOGGLEBUTTON_HXX diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx index 7b0031af1155..70fd50ebd424 100644 --- a/vbahelper/source/msforms/vbauserform.cxx +++ b/vbahelper/source/msforms/vbauserform.cxx @@ -58,7 +58,7 @@ ScVbaUserForm::~ScVbaUserForm() } void SAL_CALL -ScVbaUserForm::Show( ) throw (uno::RuntimeException) +ScVbaUserForm::Show( ) throw (uno::RuntimeException, std::exception) { SAL_INFO("vbahelper", "ScVbaUserForm::Show( )"); short aRet = 0; @@ -101,20 +101,20 @@ ScVbaUserForm::Show( ) throw (uno::RuntimeException) } OUString SAL_CALL -ScVbaUserForm::getCaption() throw (uno::RuntimeException) +ScVbaUserForm::getCaption() throw (uno::RuntimeException, std::exception) { OUString sCaption; m_xProps->getPropertyValue( "Title" ) >>= sCaption; return sCaption; } void -ScVbaUserForm::setCaption( const OUString& _caption ) throw (uno::RuntimeException) +ScVbaUserForm::setCaption( const OUString& _caption ) throw (uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( "Title", uno::makeAny( _caption ) ); } sal_Bool SAL_CALL -ScVbaUserForm::getVisible() throw (uno::RuntimeException) +ScVbaUserForm::getVisible() throw (uno::RuntimeException, std::exception) { uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY_THROW ); uno::Reference< awt::XWindow2 > xControlWindow( xControl->getPeer(), uno::UNO_QUERY_THROW ); @@ -122,7 +122,7 @@ ScVbaUserForm::getVisible() throw (uno::RuntimeException) } void SAL_CALL -ScVbaUserForm::setVisible( sal_Bool bVis ) throw (uno::RuntimeException) +ScVbaUserForm::setVisible( sal_Bool bVis ) throw (uno::RuntimeException, std::exception) { if ( bVis ) Show(); @@ -130,28 +130,28 @@ ScVbaUserForm::setVisible( sal_Bool bVis ) throw (uno::RuntimeException) Hide(); } -double SAL_CALL ScVbaUserForm::getInnerWidth() throw (uno::RuntimeException) +double SAL_CALL ScVbaUserForm::getInnerWidth() throw (uno::RuntimeException, std::exception) { return mpGeometryHelper->getInnerWidth(); } -void SAL_CALL ScVbaUserForm::setInnerWidth( double fInnerWidth ) throw (uno::RuntimeException) +void SAL_CALL ScVbaUserForm::setInnerWidth( double fInnerWidth ) throw (uno::RuntimeException, std::exception) { mpGeometryHelper->setInnerWidth( fInnerWidth ); } -double SAL_CALL ScVbaUserForm::getInnerHeight() throw (uno::RuntimeException) +double SAL_CALL ScVbaUserForm::getInnerHeight() throw (uno::RuntimeException, std::exception) { return mpGeometryHelper->getInnerHeight(); } -void SAL_CALL ScVbaUserForm::setInnerHeight( double fInnerHeight ) throw (uno::RuntimeException) +void SAL_CALL ScVbaUserForm::setInnerHeight( double fInnerHeight ) throw (uno::RuntimeException, std::exception) { mpGeometryHelper->setInnerHeight( fInnerHeight ); } void SAL_CALL -ScVbaUserForm::Hide( ) throw (uno::RuntimeException) +ScVbaUserForm::Hide( ) throw (uno::RuntimeException, std::exception) { mbDispose = false; // hide not dispose if ( m_xDialog.is() ) @@ -159,14 +159,14 @@ ScVbaUserForm::Hide( ) throw (uno::RuntimeException) } void SAL_CALL -ScVbaUserForm::RePaint( ) throw (uno::RuntimeException) +ScVbaUserForm::RePaint( ) throw (uno::RuntimeException, std::exception) { // #STUB // do nothing } void SAL_CALL -ScVbaUserForm::UnloadObject( ) throw (uno::RuntimeException) +ScVbaUserForm::UnloadObject( ) throw (uno::RuntimeException, std::exception) { mbDispose = true; if ( m_xDialog.is() ) @@ -192,19 +192,19 @@ ScVbaUserForm::getServiceNames() } uno::Reference< beans::XIntrospectionAccess > SAL_CALL -ScVbaUserForm::getIntrospection( ) throw (uno::RuntimeException) +ScVbaUserForm::getIntrospection( ) throw (uno::RuntimeException, std::exception) { return uno::Reference< beans::XIntrospectionAccess >(); } uno::Any SAL_CALL -ScVbaUserForm::invoke( const OUString& /*aFunctionName*/, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +ScVbaUserForm::invoke( const OUString& /*aFunctionName*/, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception) { throw uno::RuntimeException(); // unsupported operation } void SAL_CALL -ScVbaUserForm::setValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +ScVbaUserForm::setValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception) { uno::Any aObject = getValue( aPropertyName ); @@ -248,7 +248,7 @@ ScVbaUserForm::nestedSearch( const OUString& aPropertyName, uno::Reference< awt: } uno::Any SAL_CALL -ScVbaUserForm::getValue( const OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException) +ScVbaUserForm::getValue( const OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { uno::Any aResult; @@ -273,12 +273,12 @@ ScVbaUserForm::getValue( const OUString& aPropertyName ) throw (beans::UnknownPr } ::sal_Bool SAL_CALL -ScVbaUserForm::hasMethod( const OUString& /*aName*/ ) throw (uno::RuntimeException) +ScVbaUserForm::hasMethod( const OUString& /*aName*/ ) throw (uno::RuntimeException, std::exception) { return sal_False; } uno::Any SAL_CALL -ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException) +ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException, std::exception) { // if the dialog already closed we should do nothing, but the VBA will call methods of the Controls objects // thus we have to provide a dummy object in this case @@ -290,7 +290,7 @@ ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException) } ::sal_Bool SAL_CALL -ScVbaUserForm::hasProperty( const OUString& aName ) throw (uno::RuntimeException) +ScVbaUserForm::hasProperty( const OUString& aName ) throw (uno::RuntimeException, std::exception) { uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY ); diff --git a/vbahelper/source/msforms/vbauserform.hxx b/vbahelper/source/msforms/vbauserform.hxx index 99c00dfaf094..d3890ae82d87 100644 --- a/vbahelper/source/msforms/vbauserform.hxx +++ b/vbahelper/source/msforms/vbauserform.hxx @@ -43,26 +43,26 @@ public: virtual ~ScVbaUserForm(); static css::uno::Reference< css::awt::XControl > nestedSearch( const OUString& aPropertyName, css::uno::Reference< css::awt::XControlContainer >& xContainer ); // XUserForm - virtual void SAL_CALL RePaint( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL Show( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); - virtual OUString SAL_CALL getCaption() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getInnerWidth() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setInnerWidth( double fInnerWidth ) throw (::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getInnerHeight() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setInnerHeight( double fInnerHeight ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL Hide( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL UnloadObject( ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& index ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getVisible() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setVisible( sal_Bool bVis ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL RePaint( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Show( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCaption() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL getInnerWidth() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setInnerWidth( double fInnerWidth ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL getInnerHeight() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setInnerHeight( double fInnerHeight ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL Hide( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL UnloadObject( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getVisible() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setVisible( sal_Bool bVis ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XIntrospection - virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException, std::exception); //XHelperInterface virtual OUString getServiceImplName(); virtual css::uno::Sequence<OUString> getServiceNames(); diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index 056df1f80f0e..450f7b156b4a 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -183,14 +183,14 @@ VbaApplicationBase::~VbaApplicationBase() } sal_Bool SAL_CALL -VbaApplicationBase::getScreenUpdating() throw (uno::RuntimeException) +VbaApplicationBase::getScreenUpdating() throw (uno::RuntimeException, std::exception) { uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); return !xModel->hasControllersLocked(); } void SAL_CALL -VbaApplicationBase::setScreenUpdating(sal_Bool bUpdate) throw (uno::RuntimeException) +VbaApplicationBase::setScreenUpdating(sal_Bool bUpdate) throw (uno::RuntimeException, std::exception) { uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); // #163808# use helper from module "basic" to lock all documents of this application @@ -198,7 +198,7 @@ VbaApplicationBase::setScreenUpdating(sal_Bool bUpdate) throw (uno::RuntimeExcep } sal_Bool SAL_CALL -VbaApplicationBase::getDisplayStatusBar() throw (uno::RuntimeException) +VbaApplicationBase::getDisplayStatusBar() throw (uno::RuntimeException, std::exception) { uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); @@ -215,7 +215,7 @@ VbaApplicationBase::getDisplayStatusBar() throw (uno::RuntimeException) } void SAL_CALL -VbaApplicationBase::setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (uno::RuntimeException) +VbaApplicationBase::setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (uno::RuntimeException, std::exception) { uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); @@ -240,7 +240,7 @@ VbaApplicationBase::setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (uno:: } ::sal_Bool SAL_CALL VbaApplicationBase::getInteractive() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); @@ -250,26 +250,26 @@ VbaApplicationBase::setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (uno:: } void SAL_CALL VbaApplicationBase::setInteractive( ::sal_Bool bInteractive ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); // #163808# use helper from module "basic" to enable/disable all container windows of all documents of this application ::basic::vba::enableContainerWindowsOfAllDocuments( xModel, bInteractive ); } -sal_Bool SAL_CALL VbaApplicationBase::getVisible() throw (uno::RuntimeException) +sal_Bool SAL_CALL VbaApplicationBase::getVisible() throw (uno::RuntimeException, std::exception) { return m_pImpl->mbVisible; // dummy implementation } -void SAL_CALL VbaApplicationBase::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException) +void SAL_CALL VbaApplicationBase::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException, std::exception) { m_pImpl->mbVisible = bVisible; // dummy implementation } void SAL_CALL -VbaApplicationBase::OnKey( const OUString& Key, const uno::Any& Procedure ) throw (uno::RuntimeException) +VbaApplicationBase::OnKey( const OUString& Key, const uno::Any& Procedure ) throw (uno::RuntimeException, std::exception) { // parse the Key & modifiers awt::KeyEvent aKeyEvent = parseKeyEvent( Key ); @@ -291,7 +291,7 @@ VbaApplicationBase::OnKey( const OUString& Key, const uno::Any& Procedure ) thro } uno::Any SAL_CALL -VbaApplicationBase::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException) +VbaApplicationBase::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception) { uno::Reference< XCommandBars > xCommandBars( new ScVbaCommandBars( this, mxContext, uno::Reference< container::XIndexAccess >(), getCurrentDocument() ) ); if( aIndex.hasValue() ) @@ -300,12 +300,12 @@ VbaApplicationBase::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeExc } OUString SAL_CALL -VbaApplicationBase::getVersion() throw (uno::RuntimeException) +VbaApplicationBase::getVersion() throw (uno::RuntimeException, std::exception) { return OUString(OFFICEVERSION); } -uno::Any SAL_CALL VbaApplicationBase::Run( const OUString& MacroName, const uno::Any& varg1, const uno::Any& varg2, const uno::Any& varg3, const uno::Any& varg4, const uno::Any& varg5, const uno::Any& varg6, const uno::Any& varg7, const uno::Any& varg8, const uno::Any& varg9, const uno::Any& varg10, const uno::Any& varg11, const uno::Any& varg12, const uno::Any& varg13, const uno::Any& varg14, const uno::Any& varg15, const uno::Any& varg16, const uno::Any& varg17, const uno::Any& varg18, const uno::Any& varg19, const uno::Any& varg20, const uno::Any& varg21, const uno::Any& varg22, const uno::Any& varg23, const uno::Any& varg24, const uno::Any& varg25, const uno::Any& varg26, const uno::Any& varg27, const uno::Any& varg28, const uno::Any& varg29, const uno::Any& varg30 ) throw (uno::RuntimeException) +uno::Any SAL_CALL VbaApplicationBase::Run( const OUString& MacroName, const uno::Any& varg1, const uno::Any& varg2, const uno::Any& varg3, const uno::Any& varg4, const uno::Any& varg5, const uno::Any& varg6, const uno::Any& varg7, const uno::Any& varg8, const uno::Any& varg9, const uno::Any& varg10, const uno::Any& varg11, const uno::Any& varg12, const uno::Any& varg13, const uno::Any& varg14, const uno::Any& varg15, const uno::Any& varg16, const uno::Any& varg17, const uno::Any& varg18, const uno::Any& varg19, const uno::Any& varg20, const uno::Any& varg21, const uno::Any& varg22, const uno::Any& varg23, const uno::Any& varg24, const uno::Any& varg25, const uno::Any& varg26, const uno::Any& varg27, const uno::Any& varg28, const uno::Any& varg29, const uno::Any& varg30 ) throw (uno::RuntimeException, std::exception) { OUString aMacroName = MacroName.trim(); if( aMacroName.startsWith("!") ) @@ -356,7 +356,7 @@ uno::Any SAL_CALL VbaApplicationBase::Run( const OUString& MacroName, const uno: } void SAL_CALL VbaApplicationBase::OnTime( const uno::Any& aEarliestTime, const OUString& aFunction, const uno::Any& aLatestTime, const uno::Any& aSchedule ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { if ( aFunction.isEmpty() ) throw uno::RuntimeException( "Unexpected function name!" , uno::Reference< uno::XInterface >() ); @@ -388,14 +388,14 @@ void SAL_CALL VbaApplicationBase::OnTime( const uno::Any& aEarliestTime, const O } } -float SAL_CALL VbaApplicationBase::CentimetersToPoints( float _Centimeters ) throw (uno::RuntimeException) +float SAL_CALL VbaApplicationBase::CentimetersToPoints( float _Centimeters ) throw (uno::RuntimeException, std::exception) { // i cm = 28.35 points static const float rate = 28.35f; return ( _Centimeters * rate ); } -uno::Any SAL_CALL VbaApplicationBase::getVBE() throw (uno::RuntimeException) +uno::Any SAL_CALL VbaApplicationBase::getVBE() throw (uno::RuntimeException, std::exception) { try // return empty object on error { @@ -432,13 +432,13 @@ VbaApplicationBase::getServiceNames() } void SAL_CALL VbaApplicationBase::Undo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); dispatchRequests( xModel, ".uno:Undo" ); } -void VbaApplicationBase::Quit() throw (uno::RuntimeException) +void VbaApplicationBase::Quit() throw (uno::RuntimeException, std::exception) { // need to stop basic SbMethod* pMeth = StarBASIC::GetActiveMethod(); diff --git a/vbahelper/source/vbahelper/vbacolorformat.cxx b/vbahelper/source/vbahelper/vbacolorformat.cxx index 86e8c71f1071..e50a3b4a09ac 100644 --- a/vbahelper/source/vbahelper/vbacolorformat.cxx +++ b/vbahelper/source/vbahelper/vbacolorformat.cxx @@ -56,7 +56,7 @@ ScVbaColorFormat::ScVbaColorFormat( const uno::Reference< XHelperInterface >& xP // Attribute sal_Int32 SAL_CALL -ScVbaColorFormat::getRGB() throw (uno::RuntimeException) +ScVbaColorFormat::getRGB() throw (uno::RuntimeException, std::exception) { sal_Int32 nRGB = 0; switch( m_nColorFormatType ) @@ -82,7 +82,7 @@ ScVbaColorFormat::getRGB() throw (uno::RuntimeException) } void SAL_CALL -ScVbaColorFormat::setRGB( sal_Int32 _rgb ) throw (uno::RuntimeException) +ScVbaColorFormat::setRGB( sal_Int32 _rgb ) throw (uno::RuntimeException, std::exception) { sal_Int32 nRGB = XLRGBToOORGB( _rgb ); switch( m_nColorFormatType ) @@ -113,7 +113,7 @@ ScVbaColorFormat::setRGB( sal_Int32 _rgb ) throw (uno::RuntimeException) } sal_Int32 SAL_CALL -ScVbaColorFormat::getSchemeColor() throw (uno::RuntimeException) +ScVbaColorFormat::getSchemeColor() throw (uno::RuntimeException, std::exception) { sal_Int32 nColor = getRGB(); // #TODO I guess the number of elements is determined by the correct scheme @@ -143,7 +143,7 @@ ScVbaColorFormat::getSchemeColor() throw (uno::RuntimeException) } void SAL_CALL -ScVbaColorFormat::setSchemeColor( sal_Int32 _schemecolor ) throw (uno::RuntimeException) +ScVbaColorFormat::setSchemeColor( sal_Int32 _schemecolor ) throw (uno::RuntimeException, std::exception) { // the table is 0 based sal_Int32 nColor = MsoColorIndices::getColorIndex( _schemecolor ); diff --git a/vbahelper/source/vbahelper/vbacolorformat.hxx b/vbahelper/source/vbahelper/vbacolorformat.hxx index 16451a769068..1a3339d34d8c 100644 --- a/vbahelper/source/vbahelper/vbacolorformat.hxx +++ b/vbahelper/source/vbahelper/vbacolorformat.hxx @@ -106,10 +106,10 @@ public: ScVbaColorFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XHelperInterface > xInternalParent, const css::uno::Reference< css::drawing::XShape > xShape, const sal_Int16 nColorFormatType ); // Attributes - virtual sal_Int32 SAL_CALL getRGB() throw (css::uno::RuntimeException); - virtual void SAL_CALL setRGB( sal_Int32 _rgb ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSchemeColor() throw (css::uno::RuntimeException); - virtual void SAL_CALL setSchemeColor( sal_Int32 _schemecolor ) throw (css::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getRGB() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setRGB( sal_Int32 _rgb ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSchemeColor() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setSchemeColor( sal_Int32 _schemecolor ) throw (css::uno::RuntimeException, std::exception); }; diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx b/vbahelper/source/vbahelper/vbacommandbar.cxx index a9a85ccf72a8..73079d1741cb 100644 --- a/vbahelper/source/vbahelper/vbacommandbar.cxx +++ b/vbahelper/source/vbahelper/vbacommandbar.cxx @@ -34,7 +34,7 @@ ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< ov::XHelperInterface > x } OUString SAL_CALL -ScVbaCommandBar::getName() throw ( uno::RuntimeException ) +ScVbaCommandBar::getName() throw ( uno::RuntimeException, std::exception ) { // This will get a "NULL length string" when Name is not set. uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW ); @@ -66,7 +66,7 @@ ScVbaCommandBar::getName() throw ( uno::RuntimeException ) return sName; } void SAL_CALL -ScVbaCommandBar::setName( const OUString& _name ) throw (uno::RuntimeException) +ScVbaCommandBar::setName( const OUString& _name ) throw (uno::RuntimeException, std::exception) { uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW ); xPropertySet->setPropertyValue( "UIName" , uno::makeAny( _name ) ); @@ -74,7 +74,7 @@ ScVbaCommandBar::setName( const OUString& _name ) throw (uno::RuntimeException) pCBarHelper->ApplyChange( m_sResourceUrl, m_xBarSettings ); } ::sal_Bool SAL_CALL -ScVbaCommandBar::getVisible() throw (uno::RuntimeException) +ScVbaCommandBar::getVisible() throw (uno::RuntimeException, std::exception) { // menu bar is always visible in OOo if( m_bIsMenu ) @@ -97,7 +97,7 @@ ScVbaCommandBar::getVisible() throw (uno::RuntimeException) return bVisible; } void SAL_CALL -ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException) +ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException, std::exception) { try { @@ -120,21 +120,21 @@ ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException) } ::sal_Bool SAL_CALL -ScVbaCommandBar::getEnabled() throw (uno::RuntimeException) +ScVbaCommandBar::getEnabled() throw (uno::RuntimeException, std::exception) { // emulated with Visible return getVisible(); } void SAL_CALL -ScVbaCommandBar::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException) +ScVbaCommandBar::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException, std::exception) { // emulated with Visible setVisible( _enabled ); } void SAL_CALL -ScVbaCommandBar::Delete( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaCommandBar::Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { pCBarHelper->removeSettings( m_sResourceUrl ); uno::Reference< container::XNameContainer > xNameContainer( pCBarHelper->getPersistentWindowState(), uno::UNO_QUERY_THROW ); @@ -144,7 +144,7 @@ ScVbaCommandBar::Delete( ) throw (script::BasicErrorException, uno::RuntimeExce } } uno::Any SAL_CALL -ScVbaCommandBar::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaCommandBar::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, m_xBarSettings, pCBarHelper, m_xBarSettings, m_sResourceUrl ) ); if( aIndex.hasValue() ) @@ -155,7 +155,7 @@ ScVbaCommandBar::Controls( const uno::Any& aIndex ) throw (script::BasicErrorExc } sal_Int32 SAL_CALL -ScVbaCommandBar::Type() throw (script::BasicErrorException, uno::RuntimeException) +ScVbaCommandBar::Type() throw (script::BasicErrorException, uno::RuntimeException, std::exception) { // #FIXME support msoBarTypePopup sal_Int32 nType = office::MsoBarType::msoBarTypePopup; @@ -164,7 +164,7 @@ ScVbaCommandBar::Type() throw (script::BasicErrorException, uno::RuntimeExceptio } uno::Any SAL_CALL -ScVbaCommandBar::FindControl( const uno::Any& /*aType*/, const uno::Any& /*aId*/, const uno::Any& /*aTag*/, const uno::Any& /*aVisible*/, const uno::Any& /*aRecursive*/ ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaCommandBar::FindControl( const uno::Any& /*aType*/, const uno::Any& /*aId*/, const uno::Any& /*aTag*/, const uno::Any& /*aVisible*/, const uno::Any& /*aRecursive*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { // alwayse fail to find control return uno::makeAny( uno::Reference< XCommandBarControl > () ); @@ -199,46 +199,46 @@ VbaDummyCommandBar::VbaDummyCommandBar( { } -OUString SAL_CALL VbaDummyCommandBar::getName() throw ( uno::RuntimeException ) +OUString SAL_CALL VbaDummyCommandBar::getName() throw ( uno::RuntimeException, std::exception ) { return maName; } -void SAL_CALL VbaDummyCommandBar::setName( const OUString& _name ) throw (uno::RuntimeException) +void SAL_CALL VbaDummyCommandBar::setName( const OUString& _name ) throw (uno::RuntimeException, std::exception) { maName = _name; } -::sal_Bool SAL_CALL VbaDummyCommandBar::getVisible() throw (uno::RuntimeException) +::sal_Bool SAL_CALL VbaDummyCommandBar::getVisible() throw (uno::RuntimeException, std::exception) { // #STUB return sal_True; } -void SAL_CALL VbaDummyCommandBar::setVisible( ::sal_Bool /*_visible*/ ) throw (uno::RuntimeException) +void SAL_CALL VbaDummyCommandBar::setVisible( ::sal_Bool /*_visible*/ ) throw (uno::RuntimeException, std::exception) { // #STUB } -::sal_Bool SAL_CALL VbaDummyCommandBar::getEnabled() throw (uno::RuntimeException) +::sal_Bool SAL_CALL VbaDummyCommandBar::getEnabled() throw (uno::RuntimeException, std::exception) { // emulated with Visible return getVisible(); } -void SAL_CALL VbaDummyCommandBar::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException) +void SAL_CALL VbaDummyCommandBar::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException, std::exception) { // emulated with Visible setVisible( _enabled ); } -void SAL_CALL VbaDummyCommandBar::Delete( ) throw (script::BasicErrorException, uno::RuntimeException) +void SAL_CALL VbaDummyCommandBar::Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { // no-op // #STUB } -uno::Any SAL_CALL VbaDummyCommandBar::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException) +uno::Any SAL_CALL VbaDummyCommandBar::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { uno::Reference< XCommandBarControls > xCommandBarControls( new VbaDummyCommandBarControls( this, mxContext ) ); if( aIndex.hasValue() ) @@ -246,12 +246,12 @@ uno::Any SAL_CALL VbaDummyCommandBar::Controls( const uno::Any& aIndex ) throw ( return uno::Any( xCommandBarControls ); } -sal_Int32 SAL_CALL VbaDummyCommandBar::Type() throw (script::BasicErrorException, uno::RuntimeException) +sal_Int32 SAL_CALL VbaDummyCommandBar::Type() throw (script::BasicErrorException, uno::RuntimeException, std::exception) { return mnType; } -uno::Any SAL_CALL VbaDummyCommandBar::FindControl( const uno::Any& /*aType*/, const uno::Any& /*aId*/, const uno::Any& /*aTag*/, const uno::Any& /*aVisible*/, const uno::Any& /*aRecursive*/ ) throw (script::BasicErrorException, uno::RuntimeException) +uno::Any SAL_CALL VbaDummyCommandBar::FindControl( const uno::Any& /*aType*/, const uno::Any& /*aId*/, const uno::Any& /*aTag*/, const uno::Any& /*aVisible*/, const uno::Any& /*aRecursive*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { return uno::Any( uno::Reference< XCommandBarControl >() ); } diff --git a/vbahelper/source/vbahelper/vbacommandbar.hxx b/vbahelper/source/vbahelper/vbacommandbar.hxx index 2fa521fb21e3..e8432e68564f 100644 --- a/vbahelper/source/vbahelper/vbacommandbar.hxx +++ b/vbahelper/source/vbahelper/vbacommandbar.hxx @@ -46,18 +46,18 @@ public: sal_Bool IsMenu() const { return m_bIsMenu; } // Attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException); - virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException); - virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception); // Methods - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL Type( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL FindControl( const css::uno::Any& aType, const css::uno::Any& aId, const css::uno::Any& aTag, const css::uno::Any& aVisible, const css::uno::Any& aRecursive ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL Type( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL FindControl( const css::uno::Any& aType, const css::uno::Any& aId, const css::uno::Any& aTag, const css::uno::Any& aVisible, const css::uno::Any& aRecursive ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); // XHelperInterface virtual OUString getServiceImplName(); @@ -75,18 +75,18 @@ public: sal_Int32 nType ) throw( css::uno::RuntimeException ); // Attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException); - virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException); - virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception); // Methods - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL Type( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL FindControl( const css::uno::Any& aType, const css::uno::Any& aId, const css::uno::Any& aTag, const css::uno::Any& aVisible, const css::uno::Any& aRecursive ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL Type( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL FindControl( const css::uno::Any& aType, const css::uno::Any& aId, const css::uno::Any& aTag, const css::uno::Any& aVisible, const css::uno::Any& aRecursive ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); // XHelperInterface virtual OUString getServiceImplName(); diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx index 3f6efe2cdc83..08dbbf8d4d19 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx @@ -36,7 +36,7 @@ void ScVbaCommandBarControl::ApplyChange() throw ( uno::RuntimeException ) } OUString SAL_CALL -ScVbaCommandBarControl::getCaption() throw ( uno::RuntimeException ) +ScVbaCommandBarControl::getCaption() throw ( uno::RuntimeException, std::exception ) { // "Label" always empty OUString sCaption; @@ -45,7 +45,7 @@ ScVbaCommandBarControl::getCaption() throw ( uno::RuntimeException ) } void SAL_CALL -ScVbaCommandBarControl::setCaption( const OUString& _caption ) throw (uno::RuntimeException) +ScVbaCommandBarControl::setCaption( const OUString& _caption ) throw (uno::RuntimeException, std::exception) { OUString sCaption = _caption.replace('&','~'); setPropertyValue( m_aPropertyValues, "Label" , uno::makeAny( sCaption ) ); @@ -53,7 +53,7 @@ ScVbaCommandBarControl::setCaption( const OUString& _caption ) throw (uno::Runti } OUString SAL_CALL -ScVbaCommandBarControl::getOnAction() throw (uno::RuntimeException) +ScVbaCommandBarControl::getOnAction() throw (uno::RuntimeException, std::exception) { OUString sCommandURL; getPropertyValue( m_aPropertyValues, "CommandURL" ) >>= sCommandURL; @@ -61,7 +61,7 @@ ScVbaCommandBarControl::getOnAction() throw (uno::RuntimeException) } void SAL_CALL -ScVbaCommandBarControl::setOnAction( const OUString& _onaction ) throw (uno::RuntimeException) +ScVbaCommandBarControl::setOnAction( const OUString& _onaction ) throw (uno::RuntimeException, std::exception) { // get the current model uno::Reference< frame::XModel > xModel( pCBarHelper->getModel() ); @@ -76,7 +76,7 @@ ScVbaCommandBarControl::setOnAction( const OUString& _onaction ) throw (uno::Run } ::sal_Bool SAL_CALL -ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException) +ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException, std::exception) { sal_Bool bVisible = sal_True; uno::Any aValue = getPropertyValue( m_aPropertyValues, ITEM_DESCRIPTOR_ISVISIBLE ); @@ -85,7 +85,7 @@ ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException) return bVisible; } void SAL_CALL -ScVbaCommandBarControl::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException) +ScVbaCommandBarControl::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException, std::exception) { uno::Any aValue = getPropertyValue( m_aPropertyValues, ITEM_DESCRIPTOR_ISVISIBLE ); if( aValue.hasValue() ) @@ -96,7 +96,7 @@ ScVbaCommandBarControl::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeExc } ::sal_Bool SAL_CALL -ScVbaCommandBarControl::getEnabled() throw (uno::RuntimeException) +ScVbaCommandBarControl::getEnabled() throw (uno::RuntimeException, std::exception) { sal_Bool bEnabled = sal_True; @@ -114,7 +114,7 @@ ScVbaCommandBarControl::getEnabled() throw (uno::RuntimeException) } void SAL_CALL -ScVbaCommandBarControl::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException) +ScVbaCommandBarControl::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException, std::exception) { uno::Any aValue = getPropertyValue( m_aPropertyValues, ITEM_DESCRIPTOR_ENABLED ); if( aValue.hasValue() ) @@ -130,7 +130,7 @@ ScVbaCommandBarControl::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeExcep } ::sal_Bool SAL_CALL -ScVbaCommandBarControl::getBeginGroup() throw (css::uno::RuntimeException) +ScVbaCommandBarControl::getBeginGroup() throw (css::uno::RuntimeException, std::exception) { // TODO: need to check if the item before this item is of type 'separator' //#STUB @@ -138,7 +138,7 @@ ScVbaCommandBarControl::getBeginGroup() throw (css::uno::RuntimeException) } void SAL_CALL -ScVbaCommandBarControl::setBeginGroup( ::sal_Bool _begin ) throw (css::uno::RuntimeException) +ScVbaCommandBarControl::setBeginGroup( ::sal_Bool _begin ) throw (css::uno::RuntimeException, std::exception) { if( getBeginGroup() != _begin ) { @@ -147,7 +147,7 @@ ScVbaCommandBarControl::setBeginGroup( ::sal_Bool _begin ) throw (css::uno::Runt } void SAL_CALL -ScVbaCommandBarControl::Delete( ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaCommandBarControl::Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { if( m_xCurrentSettings.is() ) { @@ -159,7 +159,7 @@ ScVbaCommandBarControl::Delete( ) throw (script::BasicErrorException, uno::Runt } uno::Any SAL_CALL -ScVbaCommandBarControl::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaCommandBarControl::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { // only Popup Menu has controls uno::Reference< container::XIndexAccess > xSubMenu; diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx index e8946e304ed1..10746d3bfcb4 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx @@ -49,24 +49,24 @@ public: ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl ) throw (css::uno::RuntimeException); // Attributes - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException); - virtual OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException); - virtual void SAL_CALL setOnAction( const OUString& _onaction ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException); - virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException); - virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL getBeginGroup() throw (css::uno::RuntimeException); - virtual void SAL_CALL setBeginGroup( ::sal_Bool _begin ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setOnAction( const OUString& _onaction ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getBeginGroup() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBeginGroup( ::sal_Bool _begin ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) { return ov::office::MsoControlType::msoControlButton; } // Methods - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); // XHelperInterface virtual OUString getServiceImplName(); @@ -79,7 +79,7 @@ class ScVbaCommandBarPopup : public CommandBarPopup_BASE public: ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException) + virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) { return ov::office::MsoControlType::msoControlPopup; } @@ -94,7 +94,7 @@ class ScVbaCommandBarButton : public CommandBarButton_BASE public: ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException) + virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) { return ov::office::MsoControlType::msoControlButton; } diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx index efaddfec4704..5406c1dcde85 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx @@ -30,13 +30,13 @@ class CommandBarControlEnumeration : public CommandBarControlEnumeration_BASE sal_Int32 m_nCurrentPosition; public: CommandBarControlEnumeration( CommandBarControls_BASE* pCommandBarControls ) : m_pCommandBarControls( pCommandBarControls ), m_nCurrentPosition( 0 ) {} - virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException ) + virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) { if( m_nCurrentPosition < m_pCommandBarControls->getCount() ) return sal_True; return sal_False; } - virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) + virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { if( hasMoreElements() ) { @@ -158,7 +158,7 @@ ScVbaCommandBarControls::Item( const uno::Any& aIndex, const uno::Any& /*aIndex* } uno::Reference< XCommandBarControl > SAL_CALL -ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const uno::Any& Parameter, const uno::Any& Before, const uno::Any& Temporary ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const uno::Any& Parameter, const uno::Any& Before, const uno::Any& Temporary ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { // Parameter is not supported // the following name needs to be individually created; @@ -254,14 +254,14 @@ class VbaDummyIndexAccess : public ::cppu::WeakImplHelper1< container::XIndexAcc public: inline VbaDummyIndexAccess() {} // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) { return 0; } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 /*Index*/ ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 /*Index*/ ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { throw lang::IndexOutOfBoundsException(); } // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) { return cppu::UnoType<XCommandBarControl>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return false; } }; @@ -297,7 +297,7 @@ uno::Any SAL_CALL VbaDummyCommandBarControls::Item( const uno::Any& /*aIndex*/, } uno::Reference< XCommandBarControl > SAL_CALL VbaDummyCommandBarControls::Add( - const uno::Any& /*Type*/, const uno::Any& /*Id*/, const uno::Any& /*Parameter*/, const uno::Any& /*Before*/, const uno::Any& /*Temporary*/ ) throw (script::BasicErrorException, uno::RuntimeException) + const uno::Any& /*Type*/, const uno::Any& /*Id*/, const uno::Any& /*Parameter*/, const uno::Any& /*Before*/, const uno::Any& /*Temporary*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { return uno::Reference< XCommandBarControl >(); } diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx index 2555220092e8..e846c6e1173a 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx @@ -55,7 +55,7 @@ public: // Methods virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::XCommandBarControl > SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& Id, const css::uno::Any& Parameter, const css::uno::Any& Before, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ov::XCommandBarControl > SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& Id, const css::uno::Any& Parameter, const css::uno::Any& Before, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); // XHelperInterface virtual OUString getServiceImplName(); virtual css::uno::Sequence<OUString> getServiceNames(); @@ -75,7 +75,7 @@ public: // Methods virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::XCommandBarControl > SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& Id, const css::uno::Any& Parameter, const css::uno::Any& Before, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ov::XCommandBarControl > SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& Id, const css::uno::Any& Parameter, const css::uno::Any& Before, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); // XHelperInterface virtual OUString getServiceImplName(); virtual css::uno::Sequence<OUString> getServiceNames(); diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx index 37fe629b269b..b819afce8bab 100644 --- a/vbahelper/source/vbahelper/vbacommandbars.cxx +++ b/vbahelper/source/vbahelper/vbacommandbars.cxx @@ -47,13 +47,13 @@ public: uno::Reference< container::XNameAccess > xNameAccess = m_pCBarHelper->getPersistentWindowState(); m_sNames = xNameAccess->getElementNames(); } - virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException ) + virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) { if( m_nCurrentPosition < m_sNames.getLength() ) return sal_True; return sal_False; } - virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) + virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { // FIXME: should be add menubar if( hasMoreElements() ) @@ -158,7 +158,7 @@ ScVbaCommandBars::createCollectionObject( const uno::Any& aSource ) // XCommandBars uno::Reference< XCommandBar > SAL_CALL -ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Position*/, const css::uno::Any& /*MenuBar*/, const css::uno::Any& /*Temporary*/ ) throw (css::script::BasicErrorException, css::uno::RuntimeException) +ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Position*/, const css::uno::Any& /*MenuBar*/, const css::uno::Any& /*Temporary*/ ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) { // FIXME: only support to add Toolbar // Position - MsoBar MenuBar - sal_Bool diff --git a/vbahelper/source/vbahelper/vbacommandbars.hxx b/vbahelper/source/vbahelper/vbacommandbars.hxx index a3bbbb865d03..a8aedee06865 100644 --- a/vbahelper/source/vbahelper/vbacommandbars.hxx +++ b/vbahelper/source/vbahelper/vbacommandbars.hxx @@ -39,7 +39,7 @@ public: virtual ~ScVbaCommandBars(); // XCommandBars - virtual css::uno::Reference< ov::XCommandBar > SAL_CALL Add( const css::uno::Any& Name, const css::uno::Any& Position, const css::uno::Any& MenuBar, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ov::XCommandBar > SAL_CALL Add( const css::uno::Any& Name, const css::uno::Any& Position, const css::uno::Any& MenuBar, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); diff --git a/vbahelper/source/vbahelper/vbadialogbase.cxx b/vbahelper/source/vbahelper/vbadialogbase.cxx index 6cfb3c8166fc..654adf3422c9 100644 --- a/vbahelper/source/vbahelper/vbadialogbase.cxx +++ b/vbahelper/source/vbahelper/vbadialogbase.cxx @@ -22,7 +22,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -void SAL_CALL VbaDialogBase::Show() throw ( uno::RuntimeException ) +void SAL_CALL VbaDialogBase::Show() throw ( uno::RuntimeException, std::exception ) { OUString aURL; if ( m_xModel.is() ) diff --git a/vbahelper/source/vbahelper/vbadialogsbase.cxx b/vbahelper/source/vbahelper/vbadialogsbase.cxx index f96672bebb7d..4ff570f2c6d8 100644 --- a/vbahelper/source/vbahelper/vbadialogsbase.cxx +++ b/vbahelper/source/vbahelper/vbadialogsbase.cxx @@ -22,14 +22,14 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; ::sal_Int32 -VbaDialogsBase::getCount() throw (uno::RuntimeException) +VbaDialogsBase::getCount() throw (uno::RuntimeException, std::exception) { //#STUB return 0; } uno::Any -VbaDialogsBase::Item( const uno::Any& /* &aItem */) throw (uno::RuntimeException) +VbaDialogsBase::Item( const uno::Any& /* &aItem */) throw (uno::RuntimeException, std::exception) { //#STUB return uno::Any(); diff --git a/vbahelper/source/vbahelper/vbadocumentbase.cxx b/vbahelper/source/vbahelper/vbadocumentbase.cxx index dc5a7cc6549b..cf4ed630147b 100644 --- a/vbahelper/source/vbahelper/vbadocumentbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentbase.cxx @@ -52,7 +52,7 @@ VbaDocumentBase::VbaDocumentBase( uno::Sequence< uno::Any> const & args, } OUString -VbaDocumentBase::getName() throw (uno::RuntimeException) +VbaDocumentBase::getName() throw (uno::RuntimeException, std::exception) { return VbaDocumentBase::getNameFromModel( getModel() ); } @@ -75,7 +75,7 @@ OUString VbaDocumentBase::getNameFromModel( const uno::Reference< frame::XModel return sName; } OUString -VbaDocumentBase::getPath() throw (uno::RuntimeException) +VbaDocumentBase::getPath() throw (uno::RuntimeException, std::exception) { INetURLObject aURL( getModel()->getURL() ); OUString sURL = aURL.GetMainURL( INetURLObject::DECODE_TO_IURI ); @@ -89,7 +89,7 @@ VbaDocumentBase::getPath() throw (uno::RuntimeException) } OUString -VbaDocumentBase::getFullName() throw (uno::RuntimeException) +VbaDocumentBase::getFullName() throw (uno::RuntimeException, std::exception) { OUString sPath = getName(); //::osl::File::getSystemPathFromFileURL( getModel()->getURL(), sPath ); @@ -98,7 +98,7 @@ VbaDocumentBase::getFullName() throw (uno::RuntimeException) void VbaDocumentBase::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg, - const uno::Any &rRouteArg ) throw (uno::RuntimeException) + const uno::Any &rRouteArg ) throw (uno::RuntimeException, std::exception) { sal_Bool bSaveChanges = sal_False; OUString aFileName; @@ -201,7 +201,7 @@ VbaDocumentBase::Protect( const uno::Any &aPassword ) throw (uno::RuntimeExcepti } void -VbaDocumentBase::Unprotect( const uno::Any &aPassword ) throw (uno::RuntimeException) +VbaDocumentBase::Unprotect( const uno::Any &aPassword ) throw (uno::RuntimeException, std::exception) { OUString rPassword; uno::Reference< util::XProtectable > xProt( getModel(), uno::UNO_QUERY_THROW ); @@ -217,7 +217,7 @@ VbaDocumentBase::Unprotect( const uno::Any &aPassword ) throw (uno::RuntimeExcep } void -VbaDocumentBase::setSaved( sal_Bool bSave ) throw (uno::RuntimeException) +VbaDocumentBase::setSaved( sal_Bool bSave ) throw (uno::RuntimeException, std::exception) { uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW ); try @@ -239,14 +239,14 @@ VbaDocumentBase::setSaved( sal_Bool bSave ) throw (uno::RuntimeException) } sal_Bool -VbaDocumentBase::getSaved() throw (uno::RuntimeException) +VbaDocumentBase::getSaved() throw (uno::RuntimeException, std::exception) { uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW ); return !xModifiable->isModified(); } void -VbaDocumentBase::Save() throw (uno::RuntimeException) +VbaDocumentBase::Save() throw (uno::RuntimeException, std::exception) { OUString url(".uno:Save"); uno::Reference< frame::XModel > xModel = getModel(); @@ -254,14 +254,14 @@ VbaDocumentBase::Save() throw (uno::RuntimeException) } void -VbaDocumentBase::Activate() throw (uno::RuntimeException) +VbaDocumentBase::Activate() throw (uno::RuntimeException, std::exception) { uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); xFrame->activate(); } uno::Any SAL_CALL -VbaDocumentBase::getVBProject() throw (uno::RuntimeException) +VbaDocumentBase::getVBProject() throw (uno::RuntimeException, std::exception) { if( !mxVBProject.is() ) try { diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx index 73c4d13b53e8..12f134a27765 100644 --- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx @@ -93,12 +93,12 @@ public: m_it = m_documents.begin(); } // XEnumeration - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) { return m_it != m_documents.end(); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if ( !hasMoreElements() ) { @@ -147,16 +147,16 @@ public: } //XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) { return new DocumentsEnumImpl( m_xContext, m_documents ); } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) { return m_documents.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if ( Index < 0 || static_cast< Documents::size_type >(Index) >= m_documents.size() ) @@ -165,18 +165,18 @@ public: } //XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) { return cppu::UnoType<frame::XModel>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) { return (!m_documents.empty()); } //XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { NameIndexHash::const_iterator it = namesToIndices.find( aName ); if ( it == namesToIndices.end() ) @@ -185,7 +185,7 @@ public: } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > names( namesToIndices.size() ); OUString* pString = names.getArray(); @@ -196,7 +196,7 @@ public: return names; } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) { NameIndexHash::const_iterator it = namesToIndices.find( aName ); return (it != namesToIndices.end()); diff --git a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx index 2dbafa2ecc73..da9035310c8f 100644 --- a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx +++ b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx @@ -52,7 +52,7 @@ VbaEventsHelperBase::~VbaEventsHelperBase() } sal_Bool SAL_CALL VbaEventsHelperBase::processVbaEvent( sal_Int32 nEventId, const uno::Sequence< uno::Any >& rArgs ) - throw (lang::IllegalArgumentException, util::VetoException, uno::RuntimeException) + throw (lang::IllegalArgumentException, util::VetoException, uno::RuntimeException, std::exception) { /* Derived classes may add new event identifiers to be processed while processing the original event. All unprocessed events are collected in @@ -129,14 +129,14 @@ sal_Bool SAL_CALL VbaEventsHelperBase::processVbaEvent( sal_Int32 nEventId, cons return bExecuted; } -void SAL_CALL VbaEventsHelperBase::notifyEvent( const document::EventObject& rEvent ) throw (uno::RuntimeException) +void SAL_CALL VbaEventsHelperBase::notifyEvent( const document::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) { SAL_INFO("vbahelper", "VbaEventsHelperBase::notifyEvent( \"" << rEvent.EventName << "\" )"); if( rEvent.EventName == GlobalEventConfig::GetEventName( STR_EVENT_CLOSEDOC ) ) stopListening(); } -void SAL_CALL VbaEventsHelperBase::changesOccurred( const util::ChangesEvent& rEvent ) throw (uno::RuntimeException) +void SAL_CALL VbaEventsHelperBase::changesOccurred( const util::ChangesEvent& rEvent ) throw (uno::RuntimeException, std::exception) { // make sure the VBA library exists try @@ -174,7 +174,7 @@ void SAL_CALL VbaEventsHelperBase::changesOccurred( const util::ChangesEvent& rE } } -void SAL_CALL VbaEventsHelperBase::disposing( const lang::EventObject& rEvent ) throw (uno::RuntimeException) +void SAL_CALL VbaEventsHelperBase::disposing( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) { uno::Reference< frame::XModel > xSender( rEvent.Source, uno::UNO_QUERY ); if( xSender.is() ) @@ -233,7 +233,7 @@ void VbaEventsHelperBase::stopListening() } sal_Bool SAL_CALL VbaEventsHelperBase::hasVbaEventHandler( sal_Int32 nEventId, const uno::Sequence< uno::Any >& rArgs ) - throw (lang::IllegalArgumentException, uno::RuntimeException) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { EventHandlerInfoMap::const_iterator aIt = maEventInfos.find( nEventId ); if( aIt == maEventInfos.end() ) diff --git a/vbahelper/source/vbahelper/vbafillformat.cxx b/vbahelper/source/vbahelper/vbafillformat.cxx index 3142709f2e4e..0313dd8d49dd 100644 --- a/vbahelper/source/vbahelper/vbafillformat.cxx +++ b/vbahelper/source/vbahelper/vbafillformat.cxx @@ -75,7 +75,7 @@ ScVbaFillFormat::setForeColorAndInternalStyle( sal_Int32 nForeColor ) throw (css // Attributes sal_Bool SAL_CALL -ScVbaFillFormat::getVisible() throw (uno::RuntimeException) +ScVbaFillFormat::getVisible() throw (uno::RuntimeException, std::exception) { drawing::FillStyle nFillStyle; m_xPropertySet->getPropertyValue( "FillStyle" ) >>= nFillStyle; @@ -85,7 +85,7 @@ ScVbaFillFormat::getVisible() throw (uno::RuntimeException) } void SAL_CALL -ScVbaFillFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException) +ScVbaFillFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException, std::exception) { drawing::FillStyle aFillStyle; m_xPropertySet->getPropertyValue( "FillStyle" ) >>= aFillStyle; @@ -103,7 +103,7 @@ ScVbaFillFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException) } double SAL_CALL -ScVbaFillFormat::getTransparency() throw (uno::RuntimeException) +ScVbaFillFormat::getTransparency() throw (uno::RuntimeException, std::exception) { sal_Int16 nTransparence = 0; double dTransparence = 0; @@ -114,7 +114,7 @@ ScVbaFillFormat::getTransparency() throw (uno::RuntimeException) } void SAL_CALL -ScVbaFillFormat::setTransparency( double _transparency ) throw (uno::RuntimeException) +ScVbaFillFormat::setTransparency( double _transparency ) throw (uno::RuntimeException, std::exception) { sal_Int16 nTransparence = static_cast< sal_Int16 >( _transparency * 100 ); m_xPropertySet->setPropertyValue( "FillTransparence" , uno::makeAny( nTransparence ) ); @@ -123,13 +123,13 @@ ScVbaFillFormat::setTransparency( double _transparency ) throw (uno::RuntimeExce // Methods void SAL_CALL -ScVbaFillFormat::Solid() throw (uno::RuntimeException) +ScVbaFillFormat::Solid() throw (uno::RuntimeException, std::exception) { setFillStyle( drawing::FillStyle_SOLID ); } void SAL_CALL -ScVbaFillFormat::TwoColorGradient( sal_Int32 style, sal_Int32 /*variant*/ ) throw (uno::RuntimeException) +ScVbaFillFormat::TwoColorGradient( sal_Int32 style, sal_Int32 /*variant*/ ) throw (uno::RuntimeException, std::exception) { if( style == office::MsoGradientStyle::msoGradientHorizontal ) { @@ -154,7 +154,7 @@ ScVbaFillFormat::TwoColorGradient( sal_Int32 style, sal_Int32 /*variant*/ ) thro } uno::Reference< msforms::XColorFormat > SAL_CALL -ScVbaFillFormat::BackColor() throw (uno::RuntimeException) +ScVbaFillFormat::BackColor() throw (uno::RuntimeException, std::exception) { if( !m_xColorFormat.is() ) m_xColorFormat.set( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ColorFormatType::FILLFORMAT_BACKCOLOR ) ); @@ -162,7 +162,7 @@ ScVbaFillFormat::BackColor() throw (uno::RuntimeException) } uno::Reference< msforms::XColorFormat > SAL_CALL -ScVbaFillFormat::ForeColor() throw (uno::RuntimeException) +ScVbaFillFormat::ForeColor() throw (uno::RuntimeException, std::exception) { if( !m_xColorFormat.is() ) m_xColorFormat.set( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ColorFormatType::FILLFORMAT_FORECOLOR ) ); diff --git a/vbahelper/source/vbahelper/vbafillformat.hxx b/vbahelper/source/vbahelper/vbafillformat.hxx index db57a84b5e25..0d6213b4927a 100644 --- a/vbahelper/source/vbahelper/vbafillformat.hxx +++ b/vbahelper/source/vbahelper/vbafillformat.hxx @@ -47,16 +47,16 @@ public: void setForeColorAndInternalStyle( sal_Int32 nForeColor ) throw (css::uno::RuntimeException); // Attributes - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException); - virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException); - virtual double SAL_CALL getTransparency() throw (css::uno::RuntimeException); - virtual void SAL_CALL setTransparency( double _transparency ) throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception); + virtual double SAL_CALL getTransparency() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTransparency( double _transparency ) throw (css::uno::RuntimeException, std::exception); // Methods - virtual void SAL_CALL Solid() throw (css::uno::RuntimeException); - virtual void SAL_CALL TwoColorGradient( sal_Int32 style, sal_Int32 variant ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL BackColor() throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL ForeColor() throw (css::uno::RuntimeException); + virtual void SAL_CALL Solid() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL TwoColorGradient( sal_Int32 style, sal_Int32 variant ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL BackColor() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL ForeColor() throw (css::uno::RuntimeException, std::exception); }; diff --git a/vbahelper/source/vbahelper/vbafontbase.cxx b/vbahelper/source/vbahelper/vbafontbase.cxx index ad0ce5d81aea..f4cd4767fd4a 100644 --- a/vbahelper/source/vbahelper/vbafontbase.cxx +++ b/vbahelper/source/vbahelper/vbafontbase.cxx @@ -49,7 +49,7 @@ VbaFontBase::~VbaFontBase() } void SAL_CALL -VbaFontBase::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeException ) +VbaFontBase::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception ) { // not supported in form controls if( mbFormControl ) @@ -70,7 +70,7 @@ VbaFontBase::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeExcept } uno::Any SAL_CALL -VbaFontBase::getSuperscript() throw ( uno::RuntimeException ) +VbaFontBase::getSuperscript() throw ( uno::RuntimeException, std::exception ) { short nValue = NORMAL; // not supported in form controls @@ -80,7 +80,7 @@ VbaFontBase::getSuperscript() throw ( uno::RuntimeException ) } void SAL_CALL -VbaFontBase::setSubscript( const uno::Any& aValue ) throw ( uno::RuntimeException ) +VbaFontBase::setSubscript( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception ) { // not supported in form controls if( mbFormControl ) @@ -103,7 +103,7 @@ VbaFontBase::setSubscript( const uno::Any& aValue ) throw ( uno::RuntimeExceptio } uno::Any SAL_CALL -VbaFontBase::getSubscript() throw ( uno::RuntimeException ) +VbaFontBase::getSubscript() throw ( uno::RuntimeException, std::exception ) { short nValue = NORMAL; // not supported in form controls @@ -113,7 +113,7 @@ VbaFontBase::getSubscript() throw ( uno::RuntimeException ) } void SAL_CALL -VbaFontBase::setSize( const uno::Any& aValue ) throw( uno::RuntimeException ) +VbaFontBase::setSize( const uno::Any& aValue ) throw( uno::RuntimeException, std::exception ) { // form controls need a sal_Int16 containing points, other APIs need a float uno::Any aVal( aValue ); @@ -127,13 +127,13 @@ VbaFontBase::setSize( const uno::Any& aValue ) throw( uno::RuntimeException ) } uno::Any SAL_CALL -VbaFontBase::getSize() throw ( uno::RuntimeException ) +VbaFontBase::getSize() throw ( uno::RuntimeException, std::exception ) { return mxFont->getPropertyValue( VBAFONTBASE_PROPNAME( "CharHeight", "FontHeight" ) ); } void SAL_CALL -VbaFontBase::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeException ) +VbaFontBase::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeException, std::exception ) { sal_Int32 nIndex = 0; _colorindex >>= nIndex; @@ -148,7 +148,7 @@ VbaFontBase::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeExc uno::Any SAL_CALL -VbaFontBase::getColorIndex() throw ( uno::RuntimeException ) +VbaFontBase::getColorIndex() throw ( uno::RuntimeException, std::exception ) { sal_Int32 nColor = 0; @@ -169,7 +169,7 @@ VbaFontBase::getColorIndex() throw ( uno::RuntimeException ) } void SAL_CALL -VbaFontBase::setBold( const uno::Any& aValue ) throw( uno::RuntimeException ) +VbaFontBase::setBold( const uno::Any& aValue ) throw( uno::RuntimeException, std::exception ) { sal_Bool bValue = sal_False; aValue >>= bValue; @@ -181,7 +181,7 @@ VbaFontBase::setBold( const uno::Any& aValue ) throw( uno::RuntimeException ) } uno::Any SAL_CALL -VbaFontBase::getBold() throw ( uno::RuntimeException ) +VbaFontBase::getBold() throw ( uno::RuntimeException, std::exception ) { double fValue = 0.0; mxFont->getPropertyValue( VBAFONTBASE_PROPNAME( "CharWeight", "FontWeight" ) ) >>= fValue; @@ -189,7 +189,7 @@ VbaFontBase::getBold() throw ( uno::RuntimeException ) } void SAL_CALL -VbaFontBase::setStrikethrough( const uno::Any& aValue ) throw ( uno::RuntimeException ) +VbaFontBase::setStrikethrough( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception ) { sal_Bool bValue = sal_False; aValue >>= bValue; @@ -200,7 +200,7 @@ VbaFontBase::setStrikethrough( const uno::Any& aValue ) throw ( uno::RuntimeExce } uno::Any SAL_CALL -VbaFontBase::getStrikethrough() throw ( uno::RuntimeException ) +VbaFontBase::getStrikethrough() throw ( uno::RuntimeException, std::exception ) { short nValue = 0; mxFont->getPropertyValue( VBAFONTBASE_PROPNAME( "CharStrikeout", "FontStrikeout" ) ) >>= nValue; @@ -208,20 +208,20 @@ VbaFontBase::getStrikethrough() throw ( uno::RuntimeException ) } void SAL_CALL -VbaFontBase::setShadow( const uno::Any& aValue ) throw ( uno::RuntimeException ) +VbaFontBase::setShadow( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception ) { if( !mbFormControl ) mxFont->setPropertyValue( "CharShadowed" , aValue ); } uno::Any SAL_CALL -VbaFontBase::getShadow() throw (uno::RuntimeException) +VbaFontBase::getShadow() throw (uno::RuntimeException, std::exception) { return mbFormControl ? uno::Any( false ) : mxFont->getPropertyValue( "CharShadowed" ); } void SAL_CALL -VbaFontBase::setItalic( const uno::Any& aValue ) throw ( uno::RuntimeException ) +VbaFontBase::setItalic( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception ) { sal_Bool bValue = sal_False; aValue >>= bValue; @@ -232,7 +232,7 @@ VbaFontBase::setItalic( const uno::Any& aValue ) throw ( uno::RuntimeException ) } uno::Any SAL_CALL -VbaFontBase::getItalic() throw ( uno::RuntimeException ) +VbaFontBase::getItalic() throw ( uno::RuntimeException, std::exception ) { awt::FontSlant aFS; mxFont->getPropertyValue( VBAFONTBASE_PROPNAME( "CharPosture", "FontSlant" ) ) >>= aFS; @@ -240,7 +240,7 @@ VbaFontBase::getItalic() throw ( uno::RuntimeException ) } void SAL_CALL -VbaFontBase::setName( const uno::Any& aValue ) throw ( uno::RuntimeException ) +VbaFontBase::setName( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception ) { OUString sString; aValue >>= sString; @@ -248,13 +248,13 @@ VbaFontBase::setName( const uno::Any& aValue ) throw ( uno::RuntimeException ) } uno::Any SAL_CALL -VbaFontBase::getName() throw ( uno::RuntimeException ) +VbaFontBase::getName() throw ( uno::RuntimeException, std::exception ) { return mxFont->getPropertyValue( VBAFONTBASE_PROPNAME( "CharFontName", "FontName" ) ); } uno::Any -VbaFontBase::getColor() throw (uno::RuntimeException) +VbaFontBase::getColor() throw (uno::RuntimeException, std::exception) { uno::Any aAny; aAny = OORGBToXLRGB( mxFont->getPropertyValue( VBAFONTBASE_PROPNAME( "CharColor", "TextColor" ) ) ); @@ -262,7 +262,7 @@ VbaFontBase::getColor() throw (uno::RuntimeException) } void -VbaFontBase::setColor( const uno::Any& _color ) throw (uno::RuntimeException) +VbaFontBase::setColor( const uno::Any& _color ) throw (uno::RuntimeException, std::exception) { mxFont->setPropertyValue( VBAFONTBASE_PROPNAME( "CharColor", "TextColor" ), XLRGBToOORGB(_color) ); } diff --git a/vbahelper/source/vbahelper/vbaglobalbase.cxx b/vbahelper/source/vbahelper/vbaglobalbase.cxx index 28f755dc1300..4bfdb4ee8f00 100644 --- a/vbahelper/source/vbahelper/vbaglobalbase.cxx +++ b/vbahelper/source/vbahelper/vbaglobalbase.cxx @@ -117,7 +117,7 @@ VbaGlobalsBase::init( const uno::Sequence< beans::PropertyValue >& aInitArgs ) } uno::Reference< uno::XInterface > SAL_CALL -VbaGlobalsBase::createInstance( const OUString& aServiceSpecifier ) throw (uno::Exception, uno::RuntimeException) +VbaGlobalsBase::createInstance( const OUString& aServiceSpecifier ) throw (uno::Exception, uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xReturn; if ( aServiceSpecifier == sAppService ) @@ -132,7 +132,7 @@ VbaGlobalsBase::createInstance( const OUString& aServiceSpecifier ) throw (uno:: } uno::Reference< uno::XInterface > SAL_CALL -VbaGlobalsBase::createInstanceWithArguments( const OUString& aServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) throw (uno::Exception, uno::RuntimeException) +VbaGlobalsBase::createInstanceWithArguments( const OUString& aServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) throw (uno::Exception, uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xReturn; @@ -148,7 +148,7 @@ VbaGlobalsBase::createInstanceWithArguments( const OUString& aServiceSpecifier, } uno::Sequence< OUString > SAL_CALL -VbaGlobalsBase::getAvailableServiceNames( ) throw (uno::RuntimeException) +VbaGlobalsBase::getAvailableServiceNames( ) throw (uno::RuntimeException, std::exception) { static const OUString names[] = { // common diff --git a/vbahelper/source/vbahelper/vbalineformat.cxx b/vbahelper/source/vbahelper/vbalineformat.cxx index 26d198279530..f6af27ec3e64 100644 --- a/vbahelper/source/vbahelper/vbalineformat.cxx +++ b/vbahelper/source/vbahelper/vbalineformat.cxx @@ -97,7 +97,7 @@ ScVbaLineFormat::convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadSt // Attributes sal_Int32 SAL_CALL -ScVbaLineFormat::getBeginArrowheadStyle() throw (uno::RuntimeException) +ScVbaLineFormat::getBeginArrowheadStyle() throw (uno::RuntimeException, std::exception) { sal_Int32 nLineType = office::MsoArrowheadStyle::msoArrowheadNone; OUString sLineName; @@ -117,14 +117,14 @@ ScVbaLineFormat::getBeginArrowheadStyle() throw (uno::RuntimeException) } void SAL_CALL -ScVbaLineFormat::setBeginArrowheadStyle( sal_Int32 _beginarrowheadstyle ) throw (uno::RuntimeException) +ScVbaLineFormat::setBeginArrowheadStyle( sal_Int32 _beginarrowheadstyle ) throw (uno::RuntimeException, std::exception) { OUString sArrayName = convertArrowheadStyleToLineStartEndName( _beginarrowheadstyle ); m_xPropertySet->setPropertyValue( "LineStartName" , uno::makeAny( sArrayName ) ); } sal_Int32 SAL_CALL -ScVbaLineFormat::getBeginArrowheadLength() throw (uno::RuntimeException) +ScVbaLineFormat::getBeginArrowheadLength() throw (uno::RuntimeException, std::exception) { // #STUB // force error @@ -132,7 +132,7 @@ ScVbaLineFormat::getBeginArrowheadLength() throw (uno::RuntimeException) } void SAL_CALL -ScVbaLineFormat::setBeginArrowheadLength( sal_Int32 /*_beginarrowheadlength*/ ) throw (uno::RuntimeException) +ScVbaLineFormat::setBeginArrowheadLength( sal_Int32 /*_beginarrowheadlength*/ ) throw (uno::RuntimeException, std::exception) { // #STUB // force error @@ -140,7 +140,7 @@ ScVbaLineFormat::setBeginArrowheadLength( sal_Int32 /*_beginarrowheadlength*/ ) } sal_Int32 SAL_CALL -ScVbaLineFormat::getBeginArrowheadWidth() throw (uno::RuntimeException) +ScVbaLineFormat::getBeginArrowheadWidth() throw (uno::RuntimeException, std::exception) { // #STUB // force error @@ -148,7 +148,7 @@ ScVbaLineFormat::getBeginArrowheadWidth() throw (uno::RuntimeException) } void SAL_CALL -ScVbaLineFormat::setBeginArrowheadWidth( sal_Int32 /*_beginarrowheadwidth*/ ) throw (uno::RuntimeException) +ScVbaLineFormat::setBeginArrowheadWidth( sal_Int32 /*_beginarrowheadwidth*/ ) throw (uno::RuntimeException, std::exception) { // #STUB // force error @@ -156,20 +156,20 @@ ScVbaLineFormat::setBeginArrowheadWidth( sal_Int32 /*_beginarrowheadwidth*/ ) th } sal_Int32 SAL_CALL -ScVbaLineFormat::getEndArrowheadStylel() throw (uno::RuntimeException) +ScVbaLineFormat::getEndArrowheadStylel() throw (uno::RuntimeException, std::exception) { // #STUB return 0; } void SAL_CALL -ScVbaLineFormat::setEndArrowheadStylel( sal_Int32 /*_endarrowheadstylel*/ ) throw (uno::RuntimeException) +ScVbaLineFormat::setEndArrowheadStylel( sal_Int32 /*_endarrowheadstylel*/ ) throw (uno::RuntimeException, std::exception) { // #STUB } sal_Int32 SAL_CALL -ScVbaLineFormat::getEndArrowheadLength() throw (uno::RuntimeException) +ScVbaLineFormat::getEndArrowheadLength() throw (uno::RuntimeException, std::exception) { // #STUB // force error @@ -177,28 +177,28 @@ ScVbaLineFormat::getEndArrowheadLength() throw (uno::RuntimeException) } void SAL_CALL -ScVbaLineFormat::setEndArrowheadLength( sal_Int32 /*_endarrowheadlength*/ ) throw (uno::RuntimeException) +ScVbaLineFormat::setEndArrowheadLength( sal_Int32 /*_endarrowheadlength*/ ) throw (uno::RuntimeException, std::exception) { // #STUB throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." , uno::Reference< uno::XInterface >() ); } sal_Int32 SAL_CALL -ScVbaLineFormat::getEndArrowheadWidth() throw (uno::RuntimeException) +ScVbaLineFormat::getEndArrowheadWidth() throw (uno::RuntimeException, std::exception) { // #STUB throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." , uno::Reference< uno::XInterface >() ); } void SAL_CALL -ScVbaLineFormat::setEndArrowheadWidth( sal_Int32 /*_endarrowheadwidth*/ ) throw (uno::RuntimeException) +ScVbaLineFormat::setEndArrowheadWidth( sal_Int32 /*_endarrowheadwidth*/ ) throw (uno::RuntimeException, std::exception) { // #STUB throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." , uno::Reference< uno::XInterface >() ); } double SAL_CALL -ScVbaLineFormat::getWeight() throw (uno::RuntimeException) +ScVbaLineFormat::getWeight() throw (uno::RuntimeException, std::exception) { sal_Int32 nLineWidth=0; m_xPropertySet->getPropertyValue( "LineWidth" ) >>= nLineWidth; @@ -207,7 +207,7 @@ ScVbaLineFormat::getWeight() throw (uno::RuntimeException) } void SAL_CALL -ScVbaLineFormat::setWeight( double _weight ) throw (uno::RuntimeException) +ScVbaLineFormat::setWeight( double _weight ) throw (uno::RuntimeException, std::exception) { if( _weight < 0 ) throw uno::RuntimeException( "Parameter: Must be positive." , uno::Reference< uno::XInterface >() ); @@ -223,7 +223,7 @@ ScVbaLineFormat::setWeight( double _weight ) throw (uno::RuntimeException) } sal_Bool SAL_CALL -ScVbaLineFormat::getVisible() throw (uno::RuntimeException) +ScVbaLineFormat::getVisible() throw (uno::RuntimeException, std::exception) { drawing::LineStyle aLineStyle; m_xPropertySet->getPropertyValue( "LineStyle" ) >>= aLineStyle; @@ -235,7 +235,7 @@ ScVbaLineFormat::getVisible() throw (uno::RuntimeException) } void SAL_CALL -ScVbaLineFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException) +ScVbaLineFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException, std::exception) { drawing::LineStyle aLineStyle; m_xPropertySet->getPropertyValue( "LineStyle" ) >>= aLineStyle; @@ -254,7 +254,7 @@ ScVbaLineFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException) } double SAL_CALL -ScVbaLineFormat::getTransparency() throw (uno::RuntimeException) +ScVbaLineFormat::getTransparency() throw (uno::RuntimeException, std::exception) { sal_Int16 nTransparency = 0; m_xPropertySet->getPropertyValue( "LineTransparence" ) >>= nTransparency; @@ -263,14 +263,14 @@ ScVbaLineFormat::getTransparency() throw (uno::RuntimeException) } void SAL_CALL -ScVbaLineFormat::setTransparency( double _transparency ) throw (uno::RuntimeException) +ScVbaLineFormat::setTransparency( double _transparency ) throw (uno::RuntimeException, std::exception) { sal_Int16 nTransparency = static_cast<sal_Int16>( _transparency * 100 ); m_xPropertySet->setPropertyValue( "LineTransparence" , uno::makeAny( nTransparency ) ); } sal_Int16 SAL_CALL -ScVbaLineFormat::getStyle() throw (uno::RuntimeException) +ScVbaLineFormat::getStyle() throw (uno::RuntimeException, std::exception) { //OpenOffice.org only supports one LineStyle (other than the DashStyles) //Therefore we can only return the SingleLine @@ -278,7 +278,7 @@ ScVbaLineFormat::getStyle() throw (uno::RuntimeException) } void SAL_CALL -ScVbaLineFormat::setStyle( sal_Int16 /*_style */) throw (uno::RuntimeException) +ScVbaLineFormat::setStyle( sal_Int16 /*_style */) throw (uno::RuntimeException, std::exception) { //OpenOffice.org only supports one LineStyle (other than the DashStyles) //Therefore we do not set the LineStyle, because it maybe is already set @@ -289,7 +289,7 @@ ScVbaLineFormat::setStyle( sal_Int16 /*_style */) throw (uno::RuntimeException) } sal_Int32 SAL_CALL -ScVbaLineFormat::getDashStyle() throw (uno::RuntimeException) +ScVbaLineFormat::getDashStyle() throw (uno::RuntimeException, std::exception) { drawing::LineStyle eLineStyle; //LineStyle integer in Xray @@ -340,7 +340,7 @@ ScVbaLineFormat::getDashStyle() throw (uno::RuntimeException) } void SAL_CALL -ScVbaLineFormat::setDashStyle( sal_Int32 _dashstyle ) throw (uno::RuntimeException) +ScVbaLineFormat::setDashStyle( sal_Int32 _dashstyle ) throw (uno::RuntimeException, std::exception) { m_nLineDashStyle = _dashstyle; if( _dashstyle == office::MsoLineDashStyle::msoLineSolid ) @@ -413,13 +413,13 @@ ScVbaLineFormat::setDashStyle( sal_Int32 _dashstyle ) throw (uno::RuntimeExcepti // Methods uno::Reference< msforms::XColorFormat > SAL_CALL -ScVbaLineFormat::BackColor() throw (uno::RuntimeException) +ScVbaLineFormat::BackColor() throw (uno::RuntimeException, std::exception) { return uno::Reference< msforms::XColorFormat >( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ::ColorFormatType::LINEFORMAT_BACKCOLOR ) ); } uno::Reference< msforms::XColorFormat > SAL_CALL -ScVbaLineFormat::ForeColor() throw (uno::RuntimeException) +ScVbaLineFormat::ForeColor() throw (uno::RuntimeException, std::exception) { return uno::Reference< msforms::XColorFormat >( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ::ColorFormatType::LINEFORMAT_FORECOLOR ) ); } diff --git a/vbahelper/source/vbahelper/vbalineformat.hxx b/vbahelper/source/vbahelper/vbalineformat.hxx index b3c7fec374fd..5b2c2bc1b866 100644 --- a/vbahelper/source/vbahelper/vbalineformat.hxx +++ b/vbahelper/source/vbahelper/vbalineformat.hxx @@ -42,32 +42,32 @@ public: ScVbaLineFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape > xShape ); // Attributes - virtual sal_Int32 SAL_CALL getBeginArrowheadStyle() throw (css::uno::RuntimeException); - virtual void SAL_CALL setBeginArrowheadStyle( sal_Int32 _beginarrowheadstyle ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBeginArrowheadLength() throw (css::uno::RuntimeException); - virtual void SAL_CALL setBeginArrowheadLength( sal_Int32 _beginarrowheadlength ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBeginArrowheadWidth() throw (css::uno::RuntimeException); - virtual void SAL_CALL setBeginArrowheadWidth( sal_Int32 _beginarrowheadwidth ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getEndArrowheadStylel() throw (css::uno::RuntimeException); - virtual void SAL_CALL setEndArrowheadStylel( sal_Int32 _endarrowheadstylel ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getEndArrowheadLength() throw (css::uno::RuntimeException); - virtual void SAL_CALL setEndArrowheadLength( sal_Int32 _endarrowheadlength ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getEndArrowheadWidth() throw (css::uno::RuntimeException); - virtual void SAL_CALL setEndArrowheadWidth( sal_Int32 _endarrowheadwidth ) throw (css::uno::RuntimeException); - virtual double SAL_CALL getWeight() throw (css::uno::RuntimeException); - virtual void SAL_CALL setWeight( double _weight ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException); - virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException); - virtual double SAL_CALL getTransparency() throw (css::uno::RuntimeException); - virtual void SAL_CALL setTransparency( double _transparency ) throw (css::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getStyle() throw (css::uno::RuntimeException); - virtual void SAL_CALL setStyle( sal_Int16 _style ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getDashStyle() throw (css::uno::RuntimeException); - virtual void SAL_CALL setDashStyle( sal_Int32 _dashstyle ) throw (css::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getBeginArrowheadStyle() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBeginArrowheadStyle( sal_Int32 _beginarrowheadstyle ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBeginArrowheadLength() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBeginArrowheadLength( sal_Int32 _beginarrowheadlength ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBeginArrowheadWidth() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBeginArrowheadWidth( sal_Int32 _beginarrowheadwidth ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getEndArrowheadStylel() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setEndArrowheadStylel( sal_Int32 _endarrowheadstylel ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getEndArrowheadLength() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setEndArrowheadLength( sal_Int32 _endarrowheadlength ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getEndArrowheadWidth() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setEndArrowheadWidth( sal_Int32 _endarrowheadwidth ) throw (css::uno::RuntimeException, std::exception); + virtual double SAL_CALL getWeight() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setWeight( double _weight ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception); + virtual double SAL_CALL getTransparency() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTransparency( double _transparency ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setStyle( sal_Int16 _style ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDashStyle() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDashStyle( sal_Int32 _dashstyle ) throw (css::uno::RuntimeException, std::exception); // Methods - virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL BackColor() throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL ForeColor() throw (css::uno::RuntimeException); + virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL BackColor() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL ForeColor() throw (css::uno::RuntimeException, std::exception); }; #endif // INCLUDED_VBAHELPER_SOURCE_VBAHELPER_VBALINEFORMAT_HXX diff --git a/vbahelper/source/vbahelper/vbapagesetupbase.cxx b/vbahelper/source/vbahelper/vbapagesetupbase.cxx index 6222de0952f7..9ba688ab362a 100644 --- a/vbahelper/source/vbahelper/vbapagesetupbase.cxx +++ b/vbahelper/source/vbahelper/vbapagesetupbase.cxx @@ -29,7 +29,7 @@ VbaPageSetupBase::VbaPageSetupBase(const uno::Reference< XHelperInterface >& xPa { } -double SAL_CALL VbaPageSetupBase::getTopMargin() throw (css::uno::RuntimeException) +double SAL_CALL VbaPageSetupBase::getTopMargin() throw (css::uno::RuntimeException, std::exception) { sal_Bool headerOn = sal_False; sal_Int32 topMargin = 0; @@ -57,7 +57,7 @@ double SAL_CALL VbaPageSetupBase::getTopMargin() throw (css::uno::RuntimeExcepti return Millimeter::getInPoints( topMargin ); } -void SAL_CALL VbaPageSetupBase::setTopMargin( double margin ) throw (css::uno::RuntimeException) +void SAL_CALL VbaPageSetupBase::setTopMargin( double margin ) throw (css::uno::RuntimeException, std::exception) { sal_Int32 topMargin = Millimeter::getInHundredthsOfOneMillimeter( margin ); sal_Bool headerOn = sal_False; @@ -83,7 +83,7 @@ void SAL_CALL VbaPageSetupBase::setTopMargin( double margin ) throw (css::uno::R } } -double SAL_CALL VbaPageSetupBase::getBottomMargin() throw (css::uno::RuntimeException) +double SAL_CALL VbaPageSetupBase::getBottomMargin() throw (css::uno::RuntimeException, std::exception) { sal_Bool footerOn = sal_False; sal_Int32 bottomMargin = 0; @@ -111,7 +111,7 @@ double SAL_CALL VbaPageSetupBase::getBottomMargin() throw (css::uno::RuntimeExce return Millimeter::getInPoints( bottomMargin ); } -void SAL_CALL VbaPageSetupBase::setBottomMargin( double margin ) throw (css::uno::RuntimeException) +void SAL_CALL VbaPageSetupBase::setBottomMargin( double margin ) throw (css::uno::RuntimeException, std::exception) { sal_Int32 bottomMargin = Millimeter::getInHundredthsOfOneMillimeter( margin ); sal_Bool footerOn = sal_False; @@ -137,7 +137,7 @@ void SAL_CALL VbaPageSetupBase::setBottomMargin( double margin ) throw (css::uno } } -double SAL_CALL VbaPageSetupBase::getRightMargin() throw (css::uno::RuntimeException) +double SAL_CALL VbaPageSetupBase::getRightMargin() throw (css::uno::RuntimeException, std::exception) { sal_Int32 rightMargin = 0; try @@ -152,7 +152,7 @@ double SAL_CALL VbaPageSetupBase::getRightMargin() throw (css::uno::RuntimeExcep return Millimeter::getInPoints( rightMargin ); } -void SAL_CALL VbaPageSetupBase::setRightMargin( double margin ) throw (css::uno::RuntimeException) +void SAL_CALL VbaPageSetupBase::setRightMargin( double margin ) throw (css::uno::RuntimeException, std::exception) { sal_Int32 rightMargin = Millimeter::getInHundredthsOfOneMillimeter( margin ); try @@ -167,7 +167,7 @@ void SAL_CALL VbaPageSetupBase::setRightMargin( double margin ) throw (css::uno: } -double SAL_CALL VbaPageSetupBase::getLeftMargin() throw (css::uno::RuntimeException) +double SAL_CALL VbaPageSetupBase::getLeftMargin() throw (css::uno::RuntimeException, std::exception) { sal_Int32 leftMargin = 0; try @@ -182,7 +182,7 @@ double SAL_CALL VbaPageSetupBase::getLeftMargin() throw (css::uno::RuntimeExcept return Millimeter::getInPoints( leftMargin ); } -void SAL_CALL VbaPageSetupBase::setLeftMargin( double margin ) throw (css::uno::RuntimeException) +void SAL_CALL VbaPageSetupBase::setLeftMargin( double margin ) throw (css::uno::RuntimeException, std::exception) { sal_Int32 leftMargin = Millimeter::getInHundredthsOfOneMillimeter( margin ); try @@ -254,7 +254,7 @@ void SAL_CALL VbaPageSetupBase::setFooterMargin( double margin ) throw (css::uno } } -sal_Int32 SAL_CALL VbaPageSetupBase::getOrientation() throw (css::uno::RuntimeException) +sal_Int32 SAL_CALL VbaPageSetupBase::getOrientation() throw (css::uno::RuntimeException, std::exception) { sal_Int32 orientation = mnOrientPortrait; try @@ -274,7 +274,7 @@ sal_Int32 SAL_CALL VbaPageSetupBase::getOrientation() throw (css::uno::RuntimeEx return orientation; } -void SAL_CALL VbaPageSetupBase::setOrientation( sal_Int32 orientation ) throw (css::uno::RuntimeException) +void SAL_CALL VbaPageSetupBase::setOrientation( sal_Int32 orientation ) throw (css::uno::RuntimeException, std::exception) { if( ( orientation != mnOrientPortrait ) && ( orientation != mnOrientLandscape ) ) diff --git a/vbahelper/source/vbahelper/vbapictureformat.cxx b/vbahelper/source/vbahelper/vbapictureformat.cxx index 9b2aa114f6e0..4e2d86341670 100644 --- a/vbahelper/source/vbahelper/vbapictureformat.cxx +++ b/vbahelper/source/vbahelper/vbapictureformat.cxx @@ -44,7 +44,7 @@ ScVbaPictureFormat::checkParameterRangeInDouble( double nRange, double nMin, dou // Attributes double SAL_CALL -ScVbaPictureFormat::getBrightness() throw (uno::RuntimeException) +ScVbaPictureFormat::getBrightness() throw (uno::RuntimeException, std::exception) { sal_Int16 nLuminance = 0; m_xPropertySet->getPropertyValue( "AdjustLuminance" ) >>= nLuminance; @@ -54,7 +54,7 @@ ScVbaPictureFormat::getBrightness() throw (uno::RuntimeException) } void SAL_CALL -ScVbaPictureFormat::setBrightness( double _brightness ) throw (uno::RuntimeException) +ScVbaPictureFormat::setBrightness( double _brightness ) throw (uno::RuntimeException, std::exception) { checkParameterRangeInDouble( _brightness, 0.0, 1.0 ); double fLuminance = _brightness * 200 - 100; @@ -63,7 +63,7 @@ ScVbaPictureFormat::setBrightness( double _brightness ) throw (uno::RuntimeExcep } double SAL_CALL -ScVbaPictureFormat::getContrast() throw (uno::RuntimeException) +ScVbaPictureFormat::getContrast() throw (uno::RuntimeException, std::exception) { sal_Int16 nContrast = 0; m_xPropertySet->getPropertyValue( "AdjustContrast" ) >>= nContrast; @@ -73,7 +73,7 @@ ScVbaPictureFormat::getContrast() throw (uno::RuntimeException) } void SAL_CALL -ScVbaPictureFormat::setContrast( double _contrast ) throw (uno::RuntimeException) +ScVbaPictureFormat::setContrast( double _contrast ) throw (uno::RuntimeException, std::exception) { checkParameterRangeInDouble( _contrast, 0.0, 1.0 ); double fContrast = _contrast * 200 - 100; @@ -84,7 +84,7 @@ ScVbaPictureFormat::setContrast( double _contrast ) throw (uno::RuntimeException // Methods void SAL_CALL -ScVbaPictureFormat::IncrementBrightness( double increment ) throw (uno::RuntimeException) +ScVbaPictureFormat::IncrementBrightness( double increment ) throw (uno::RuntimeException, std::exception) { double fBrightness = getBrightness(); fBrightness += increment; @@ -100,7 +100,7 @@ ScVbaPictureFormat::IncrementBrightness( double increment ) throw (uno::RuntimeE } void SAL_CALL -ScVbaPictureFormat::IncrementContrast( double increment ) throw (uno::RuntimeException) +ScVbaPictureFormat::IncrementContrast( double increment ) throw (uno::RuntimeException, std::exception) { double nContrast = getContrast(); nContrast += increment; diff --git a/vbahelper/source/vbahelper/vbapictureformat.hxx b/vbahelper/source/vbahelper/vbapictureformat.hxx index 89a82ef21f18..0a70c701173c 100644 --- a/vbahelper/source/vbahelper/vbapictureformat.hxx +++ b/vbahelper/source/vbahelper/vbapictureformat.hxx @@ -40,14 +40,14 @@ public: ScVbaPictureFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::drawing::XShape > xShape ) throw( css::lang::IllegalArgumentException ); // Attributes - virtual double SAL_CALL getBrightness() throw (css::uno::RuntimeException); - virtual void SAL_CALL setBrightness( double _brightness ) throw (css::uno::RuntimeException); - virtual double SAL_CALL getContrast() throw (css::uno::RuntimeException); - virtual void SAL_CALL setContrast( double _contrast ) throw (css::uno::RuntimeException); + virtual double SAL_CALL getBrightness() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBrightness( double _brightness ) throw (css::uno::RuntimeException, std::exception); + virtual double SAL_CALL getContrast() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setContrast( double _contrast ) throw (css::uno::RuntimeException, std::exception); // Methods - virtual void SAL_CALL IncrementBrightness( double increment ) throw (css::uno::RuntimeException); - virtual void SAL_CALL IncrementContrast( double increment ) throw (css::uno::RuntimeException); + virtual void SAL_CALL IncrementBrightness( double increment ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL IncrementContrast( double increment ) throw (css::uno::RuntimeException, std::exception); }; #endif // INCLUDED_VBAHELPER_SOURCE_VBAHELPER_VBAPICTUREFORMAT_HXX diff --git a/vbahelper/source/vbahelper/vbapropvalue.cxx b/vbahelper/source/vbahelper/vbapropvalue.cxx index 4f381109f338..dcb2b6db56b0 100644 --- a/vbahelper/source/vbahelper/vbapropvalue.cxx +++ b/vbahelper/source/vbahelper/vbapropvalue.cxx @@ -25,13 +25,13 @@ ScVbaPropValue::ScVbaPropValue( PropListener* pListener ) : m_pListener( pListen } css::uno::Any SAL_CALL -ScVbaPropValue::getValue() throw (css::uno::RuntimeException) +ScVbaPropValue::getValue() throw (css::uno::RuntimeException, std::exception) { return m_pListener->getValueEvent(); } void SAL_CALL -ScVbaPropValue::setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException) +ScVbaPropValue::setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception) { m_pListener->setValueEvent( _value ); } diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx index b25b4b810320..d78b090ec2b2 100644 --- a/vbahelper/source/vbahelper/vbashape.cxx +++ b/vbahelper/source/vbahelper/vbashape.cxx @@ -59,7 +59,7 @@ ScVbaShape::~ScVbaShape() } void SAL_CALL -ScVbaShape::disposing( const lang::EventObject& rEventObject ) throw( uno::RuntimeException ) +ScVbaShape::disposing( const lang::EventObject& rEventObject ) throw( uno::RuntimeException, std::exception ) { try { @@ -152,7 +152,7 @@ ScVbaShape::getType( const css::uno::Reference< drawing::XShape > xShape ) throw // Attributes OUString SAL_CALL -ScVbaShape::getName() throw (uno::RuntimeException) +ScVbaShape::getName() throw (uno::RuntimeException, std::exception) { OUString sName; uno::Reference< container::XNamed > xNamed( m_xShape, uno::UNO_QUERY_THROW ); @@ -161,14 +161,14 @@ ScVbaShape::getName() throw (uno::RuntimeException) } void SAL_CALL -ScVbaShape::setName( const OUString& _name ) throw (uno::RuntimeException) +ScVbaShape::setName( const OUString& _name ) throw (uno::RuntimeException, std::exception) { uno::Reference< container::XNamed > xNamed( m_xShape, uno::UNO_QUERY_THROW ); xNamed->setName( _name ); } OUString SAL_CALL -ScVbaShape::getAlternativeText() throw (uno::RuntimeException) +ScVbaShape::getAlternativeText() throw (uno::RuntimeException, std::exception) { OUString sAltText; uno::Reference< beans::XPropertySet > xProps( m_xShape, uno::UNO_QUERY_THROW ); @@ -177,38 +177,38 @@ ScVbaShape::getAlternativeText() throw (uno::RuntimeException) } void SAL_CALL -ScVbaShape::setAlternativeText( const OUString& sAltText ) throw (uno::RuntimeException) +ScVbaShape::setAlternativeText( const OUString& sAltText ) throw (uno::RuntimeException, std::exception) { uno::Reference< beans::XPropertySet > xProps( m_xShape, uno::UNO_QUERY_THROW ); xProps->setPropertyValue("Title", uno::Any( sAltText ) ); } double SAL_CALL -ScVbaShape::getHeight() throw (uno::RuntimeException) +ScVbaShape::getHeight() throw (uno::RuntimeException, std::exception) { return m_pShapeHelper->getHeight(); } void SAL_CALL -ScVbaShape::setHeight( double _height ) throw (uno::RuntimeException) +ScVbaShape::setHeight( double _height ) throw (uno::RuntimeException, std::exception) { m_pShapeHelper->setHeight( _height ); } double SAL_CALL -ScVbaShape::getWidth() throw (uno::RuntimeException) +ScVbaShape::getWidth() throw (uno::RuntimeException, std::exception) { return m_pShapeHelper->getWidth(); } void SAL_CALL -ScVbaShape::setWidth( double _width ) throw (uno::RuntimeException) +ScVbaShape::setWidth( double _width ) throw (uno::RuntimeException, std::exception) { m_pShapeHelper->setWidth( _width ); } double SAL_CALL -ScVbaShape::getLeft() throw (uno::RuntimeException) +ScVbaShape::getLeft() throw (uno::RuntimeException, std::exception) { double left = 0; try @@ -226,7 +226,7 @@ ScVbaShape::getLeft() throw (uno::RuntimeException) } void SAL_CALL -ScVbaShape::setLeft( double _left ) throw (uno::RuntimeException) +ScVbaShape::setLeft( double _left ) throw (uno::RuntimeException, std::exception) { try { @@ -241,7 +241,7 @@ ScVbaShape::setLeft( double _left ) throw (uno::RuntimeException) } double SAL_CALL -ScVbaShape::getTop() throw (uno::RuntimeException) +ScVbaShape::getTop() throw (uno::RuntimeException, std::exception) { double top = 0; try @@ -258,7 +258,7 @@ ScVbaShape::getTop() throw (uno::RuntimeException) } void SAL_CALL -ScVbaShape::setTop( double _top ) throw (uno::RuntimeException) +ScVbaShape::setTop( double _top ) throw (uno::RuntimeException, std::exception) { try { @@ -273,7 +273,7 @@ ScVbaShape::setTop( double _top ) throw (uno::RuntimeException) } sal_Bool SAL_CALL -ScVbaShape::getVisible() throw (uno::RuntimeException) +ScVbaShape::getVisible() throw (uno::RuntimeException, std::exception) { // #STUB //UNO Shapes are always visible @@ -281,14 +281,14 @@ ScVbaShape::getVisible() throw (uno::RuntimeException) } void SAL_CALL -ScVbaShape::setVisible( sal_Bool /*_visible*/ ) throw (uno::RuntimeException) +ScVbaShape::setVisible( sal_Bool /*_visible*/ ) throw (uno::RuntimeException, std::exception) { // #STUB //UNO Shapes are always visible } sal_Int32 SAL_CALL -ScVbaShape::getZOrderPosition() throw (uno::RuntimeException) +ScVbaShape::getZOrderPosition() throw (uno::RuntimeException, std::exception) { sal_Int32 nZOrderPosition = 0; uno::Any aZOrderPosition = m_xPropertySet->getPropertyValue( "ZOrder" ); @@ -297,13 +297,13 @@ ScVbaShape::getZOrderPosition() throw (uno::RuntimeException) } sal_Int32 SAL_CALL -ScVbaShape::getType() throw (uno::RuntimeException) +ScVbaShape::getType() throw (uno::RuntimeException, std::exception) { return m_nType; } double SAL_CALL -ScVbaShape::getRotation() throw (uno::RuntimeException) +ScVbaShape::getRotation() throw (uno::RuntimeException, std::exception) { double dRotation = 0; sal_Int32 nRotation = 0; @@ -313,34 +313,34 @@ ScVbaShape::getRotation() throw (uno::RuntimeException) } void SAL_CALL -ScVbaShape::setRotation( double _rotation ) throw (uno::RuntimeException) +ScVbaShape::setRotation( double _rotation ) throw (uno::RuntimeException, std::exception) { sal_Int32 nRotation = static_cast < sal_Int32 > ( _rotation * 100 ); m_xPropertySet->setPropertyValue( "RotateAngle" , uno::makeAny( nRotation ) ); } uno::Reference< msforms::XLineFormat > SAL_CALL -ScVbaShape::getLine() throw (uno::RuntimeException) +ScVbaShape::getLine() throw (uno::RuntimeException, std::exception) { // TODO should ongly return line return uno::Reference< msforms::XLineFormat >( new ScVbaLineFormat( this, mxContext, m_xShape ) ); } uno::Reference< msforms::XFillFormat > SAL_CALL -ScVbaShape::getFill() throw (uno::RuntimeException) +ScVbaShape::getFill() throw (uno::RuntimeException, std::exception) { return uno::Reference< msforms::XFillFormat >( new ScVbaFillFormat( this, mxContext, m_xShape ) ); } uno::Reference< msforms::XPictureFormat > SAL_CALL -ScVbaShape::getPictureFormat() throw (uno::RuntimeException) +ScVbaShape::getPictureFormat() throw (uno::RuntimeException, std::exception) { return uno::Reference< msforms::XPictureFormat >( new ScVbaPictureFormat( this, mxContext, m_xShape ) ); } // Methods uno::Any SAL_CALL -ScVbaShape::TextFrame() throw (uno::RuntimeException) +ScVbaShape::TextFrame() throw (uno::RuntimeException, std::exception) { uno::Reference< lang::XServiceInfo > xServiceInfo( m_xModel, uno::UNO_QUERY_THROW ); if( xServiceInfo->supportsService( "com.sun.star.sheet.SpreadsheetDocument" ) ) @@ -357,14 +357,14 @@ ScVbaShape::TextFrame() throw (uno::RuntimeException) } void SAL_CALL -ScVbaShape::Delete() throw (uno::RuntimeException) +ScVbaShape::Delete() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; m_xShapes->remove( m_xShape ); } void SAL_CALL -ScVbaShape::ZOrder( sal_Int32 ZOrderCmd ) throw (uno::RuntimeException) +ScVbaShape::ZOrder( sal_Int32 ZOrderCmd ) throw (uno::RuntimeException, std::exception) { sal_Int32 nOrderPositon; uno::Any aOrderPostion = m_xPropertySet->getPropertyValue( "ZOrder" ); @@ -398,7 +398,7 @@ ScVbaShape::ZOrder( sal_Int32 ZOrderCmd ) throw (uno::RuntimeException) } void SAL_CALL -ScVbaShape::IncrementRotation( double Increment ) throw (uno::RuntimeException) +ScVbaShape::IncrementRotation( double Increment ) throw (uno::RuntimeException, std::exception) { double nCurrentRotation = getRotation(); nCurrentRotation += Increment; @@ -406,7 +406,7 @@ ScVbaShape::IncrementRotation( double Increment ) throw (uno::RuntimeException) } void SAL_CALL -ScVbaShape::IncrementLeft( double Increment ) throw (uno::RuntimeException) +ScVbaShape::IncrementLeft( double Increment ) throw (uno::RuntimeException, std::exception) { double nCurrentLeft = getLeft(); nCurrentLeft += Increment; @@ -414,7 +414,7 @@ ScVbaShape::IncrementLeft( double Increment ) throw (uno::RuntimeException) } void SAL_CALL -ScVbaShape::IncrementTop( double Increment ) throw (uno::RuntimeException) +ScVbaShape::IncrementTop( double Increment ) throw (uno::RuntimeException, std::exception) { double nCurrentTop = getTop(); nCurrentTop += Increment; @@ -422,7 +422,7 @@ ScVbaShape::IncrementTop( double Increment ) throw (uno::RuntimeException) } void SAL_CALL -ScVbaShape::ScaleHeight( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_Int32 Scale ) throw (uno::RuntimeException) +ScVbaShape::ScaleHeight( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_Int32 Scale ) throw (uno::RuntimeException, std::exception) { double nHeight = getHeight(); double nNewHeight = nHeight * Factor; @@ -451,7 +451,7 @@ ScVbaShape::ScaleHeight( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal } void SAL_CALL -ScVbaShape::ScaleWidth( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_Int32 Scale ) throw (uno::RuntimeException) +ScVbaShape::ScaleWidth( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_Int32 Scale ) throw (uno::RuntimeException, std::exception) { double nWidth = getWidth(); double nNewWidth = nWidth * Factor; @@ -480,7 +480,7 @@ ScVbaShape::ScaleWidth( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_ } void SAL_CALL -ScVbaShape::Select( const uno::Any& /*Replace*/ ) throw ( uno::RuntimeException ) +ScVbaShape::Select( const uno::Any& /*Replace*/ ) throw ( uno::RuntimeException, std::exception ) { uno::Reference< view::XSelectionSupplier > xSelectSupp( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); xSelectSupp->select( uno::makeAny( m_xShape ) ); @@ -490,7 +490,7 @@ ScVbaShape::Select( const uno::Any& /*Replace*/ ) throw ( uno::RuntimeException // dynamically create the appropriate objects e.g. TextBox, Oval, Picture etc. // ( e.g. the ones that really do have ShapeRange as an attribute ) uno::Any SAL_CALL -ScVbaShape::ShapeRange( const uno::Any& index ) throw ( uno::RuntimeException ) +ScVbaShape::ShapeRange( const uno::Any& index ) throw ( uno::RuntimeException, std::exception ) { // perhaps we should store a reference to the Shapes Collection // in this class @@ -509,33 +509,33 @@ ScVbaShape::ShapeRange( const uno::Any& index ) throw ( uno::RuntimeException ) } sal_Bool SAL_CALL -ScVbaShape::getLockAspectRatio() throw (uno::RuntimeException) +ScVbaShape::getLockAspectRatio() throw (uno::RuntimeException, std::exception) { // #STUB return sal_False; } void SAL_CALL -ScVbaShape::setLockAspectRatio( sal_Bool /*_lockaspectratio*/ ) throw (uno::RuntimeException) +ScVbaShape::setLockAspectRatio( sal_Bool /*_lockaspectratio*/ ) throw (uno::RuntimeException, std::exception) { // #STUB } sal_Bool SAL_CALL -ScVbaShape::getLockAnchor() throw (uno::RuntimeException) +ScVbaShape::getLockAnchor() throw (uno::RuntimeException, std::exception) { // #STUB return sal_True; } void SAL_CALL -ScVbaShape::setLockAnchor( sal_Bool /*_lockanchor*/ ) throw (uno::RuntimeException) +ScVbaShape::setLockAnchor( sal_Bool /*_lockanchor*/ ) throw (uno::RuntimeException, std::exception) { // #STUB } sal_Int32 SAL_CALL -ScVbaShape::getRelativeHorizontalPosition() throw (uno::RuntimeException) +ScVbaShape::getRelativeHorizontalPosition() throw (uno::RuntimeException, std::exception) { sal_Int32 nRelativeHorizontalPosition = word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionMargin; sal_Int16 nType = text::RelOrientation::PAGE_LEFT; @@ -572,7 +572,7 @@ ScVbaShape::getRelativeHorizontalPosition() throw (uno::RuntimeException) } void SAL_CALL -ScVbaShape::setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (uno::RuntimeException) +ScVbaShape::setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (uno::RuntimeException, std::exception) { sal_Int16 nType = text::RelOrientation::PAGE_FRAME; switch( _relativehorizontalposition ) @@ -606,7 +606,7 @@ ScVbaShape::setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalpositi } sal_Int32 SAL_CALL -ScVbaShape::getRelativeVerticalPosition() throw (uno::RuntimeException) +ScVbaShape::getRelativeVerticalPosition() throw (uno::RuntimeException, std::exception) { sal_Int32 nRelativeVerticalPosition = word::WdRelativeVerticalPosition::wdRelativeVerticalPositionMargin; sal_Int16 nType = text::RelOrientation::PAGE_FRAME; @@ -643,7 +643,7 @@ ScVbaShape::getRelativeVerticalPosition() throw (uno::RuntimeException) } void SAL_CALL -ScVbaShape::setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (uno::RuntimeException) +ScVbaShape::setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (uno::RuntimeException, std::exception) { sal_Int16 nType = text::RelOrientation::PAGE_FRAME; switch( _relativeverticalposition ) @@ -677,7 +677,7 @@ ScVbaShape::setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) } uno::Any SAL_CALL -ScVbaShape::WrapFormat() throw (uno::RuntimeException) +ScVbaShape::WrapFormat() throw (uno::RuntimeException, std::exception) { uno::Reference< lang::XServiceInfo > xServiceInfo( m_xModel, uno::UNO_QUERY_THROW ); if( xServiceInfo->supportsService( "com.sun.star.text.TextDocument" )) diff --git a/vbahelper/source/vbahelper/vbashaperange.cxx b/vbahelper/source/vbahelper/vbashaperange.cxx index c50b2d3118b2..9829a32ddb61 100644 --- a/vbahelper/source/vbahelper/vbashaperange.cxx +++ b/vbahelper/source/vbahelper/vbashaperange.cxx @@ -34,11 +34,11 @@ class VbShapeRangeEnumHelper : public EnumerationHelper_BASE sal_Int32 nIndex; public: VbShapeRangeEnumHelper( const uno::Reference< XCollection >& xParent, const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xParent( xParent ), m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ScVbaShapeRange* pCollectionImpl = dynamic_cast< ScVbaShapeRange* >(m_xParent.get()); if ( pCollectionImpl && hasMoreElements() ) @@ -54,14 +54,14 @@ ScVbaShapeRange::ScVbaShapeRange( const uno::Reference< XHelperInterface >& xPar // Methods void SAL_CALL -ScVbaShapeRange::Select( ) throw (uno::RuntimeException) +ScVbaShapeRange::Select( ) throw (uno::RuntimeException, std::exception) { uno::Reference< view::XSelectionSupplier > xSelectSupp( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); xSelectSupp->select( uno::makeAny( getShapes() ) ); } uno::Reference< msforms::XShape > SAL_CALL -ScVbaShapeRange::Group() throw (uno::RuntimeException) +ScVbaShapeRange::Group() throw (uno::RuntimeException, std::exception) { uno::Reference< drawing::XShapeGrouper > xShapeGrouper( m_xDrawPage, uno::UNO_QUERY_THROW ); uno::Reference< drawing::XShapeGroup > xShapeGroup( xShapeGrouper->group( getShapes() ), uno::UNO_QUERY_THROW ); @@ -85,7 +85,7 @@ ScVbaShapeRange::getShapes() throw (uno::RuntimeException) void SAL_CALL -ScVbaShapeRange::IncrementRotation( double Increment ) throw (uno::RuntimeException) +ScVbaShapeRange::IncrementRotation( double Increment ) throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; ++index ) @@ -96,7 +96,7 @@ ScVbaShapeRange::IncrementRotation( double Increment ) throw (uno::RuntimeExcept } void SAL_CALL -ScVbaShapeRange::IncrementLeft( double Increment ) throw (uno::RuntimeException) +ScVbaShapeRange::IncrementLeft( double Increment ) throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; ++index ) @@ -107,7 +107,7 @@ ScVbaShapeRange::IncrementLeft( double Increment ) throw (uno::RuntimeException) } void SAL_CALL -ScVbaShapeRange::IncrementTop( double Increment ) throw (uno::RuntimeException) +ScVbaShapeRange::IncrementTop( double Increment ) throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; ++index ) @@ -117,7 +117,7 @@ ScVbaShapeRange::IncrementTop( double Increment ) throw (uno::RuntimeException) } } -OUString SAL_CALL ScVbaShapeRange::getName() throw (uno::RuntimeException) +OUString SAL_CALL ScVbaShapeRange::getName() throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; /* ++index unreachable */ ) @@ -128,7 +128,7 @@ OUString SAL_CALL ScVbaShapeRange::getName() throw (uno::RuntimeException) throw uno::RuntimeException(); } -void SAL_CALL ScVbaShapeRange::setName( const OUString& _name ) throw (uno::RuntimeException) +void SAL_CALL ScVbaShapeRange::setName( const OUString& _name ) throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; ++index ) @@ -138,7 +138,7 @@ void SAL_CALL ScVbaShapeRange::setName( const OUString& _name ) throw (uno::Runt } } -double SAL_CALL ScVbaShapeRange::getHeight() throw (uno::RuntimeException) +double SAL_CALL ScVbaShapeRange::getHeight() throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; /* ++index unreachable */ ) @@ -149,7 +149,7 @@ double SAL_CALL ScVbaShapeRange::getHeight() throw (uno::RuntimeException) throw uno::RuntimeException(); } -void SAL_CALL ScVbaShapeRange::setHeight( double _height ) throw (uno::RuntimeException) +void SAL_CALL ScVbaShapeRange::setHeight( double _height ) throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; ++index ) @@ -159,7 +159,7 @@ void SAL_CALL ScVbaShapeRange::setHeight( double _height ) throw (uno::RuntimeEx } } -double SAL_CALL ScVbaShapeRange::getWidth() throw (uno::RuntimeException) +double SAL_CALL ScVbaShapeRange::getWidth() throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; /* ++index unreachable */ ) @@ -170,7 +170,7 @@ double SAL_CALL ScVbaShapeRange::getWidth() throw (uno::RuntimeException) throw uno::RuntimeException(); } -void SAL_CALL ScVbaShapeRange::setWidth( double _width ) throw (uno::RuntimeException) +void SAL_CALL ScVbaShapeRange::setWidth( double _width ) throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; ++index ) @@ -180,7 +180,7 @@ void SAL_CALL ScVbaShapeRange::setWidth( double _width ) throw (uno::RuntimeExce } } -double SAL_CALL ScVbaShapeRange::getLeft() throw (uno::RuntimeException) +double SAL_CALL ScVbaShapeRange::getLeft() throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; /* ++index unreachable */ ) @@ -191,7 +191,7 @@ double SAL_CALL ScVbaShapeRange::getLeft() throw (uno::RuntimeException) throw uno::RuntimeException(); } -void SAL_CALL ScVbaShapeRange::setLeft( double _left ) throw (uno::RuntimeException) +void SAL_CALL ScVbaShapeRange::setLeft( double _left ) throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; ++index ) @@ -201,7 +201,7 @@ void SAL_CALL ScVbaShapeRange::setLeft( double _left ) throw (uno::RuntimeExcept } } -double SAL_CALL ScVbaShapeRange::getTop() throw (uno::RuntimeException) +double SAL_CALL ScVbaShapeRange::getTop() throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; /* ++index unreachable */ ) @@ -212,7 +212,7 @@ double SAL_CALL ScVbaShapeRange::getTop() throw (uno::RuntimeException) throw uno::RuntimeException(); } -void SAL_CALL ScVbaShapeRange::setTop( double _top ) throw (uno::RuntimeException) +void SAL_CALL ScVbaShapeRange::setTop( double _top ) throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; ++index ) @@ -222,7 +222,7 @@ void SAL_CALL ScVbaShapeRange::setTop( double _top ) throw (uno::RuntimeExceptio } } -uno::Reference< ov::msforms::XLineFormat > SAL_CALL ScVbaShapeRange::getLine() throw (css::uno::RuntimeException) +uno::Reference< ov::msforms::XLineFormat > SAL_CALL ScVbaShapeRange::getLine() throw (css::uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; /* ++index unreachable */ ) @@ -233,7 +233,7 @@ uno::Reference< ov::msforms::XLineFormat > SAL_CALL ScVbaShapeRange::getLine() t throw uno::RuntimeException(); } -uno::Reference< ov::msforms::XFillFormat > SAL_CALL ScVbaShapeRange::getFill() throw (css::uno::RuntimeException) +uno::Reference< ov::msforms::XFillFormat > SAL_CALL ScVbaShapeRange::getFill() throw (css::uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; /* ++index unreachable */ ) @@ -244,7 +244,7 @@ uno::Reference< ov::msforms::XFillFormat > SAL_CALL ScVbaShapeRange::getFill() t throw uno::RuntimeException(); } -::sal_Bool SAL_CALL ScVbaShapeRange::getLockAspectRatio() throw (uno::RuntimeException) +::sal_Bool SAL_CALL ScVbaShapeRange::getLockAspectRatio() throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; /* ++index unreachable */ ) @@ -255,7 +255,7 @@ uno::Reference< ov::msforms::XFillFormat > SAL_CALL ScVbaShapeRange::getFill() t throw uno::RuntimeException(); } -void SAL_CALL ScVbaShapeRange::setLockAspectRatio( ::sal_Bool _lockaspectratio ) throw (uno::RuntimeException) +void SAL_CALL ScVbaShapeRange::setLockAspectRatio( ::sal_Bool _lockaspectratio ) throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; ++index ) @@ -265,7 +265,7 @@ void SAL_CALL ScVbaShapeRange::setLockAspectRatio( ::sal_Bool _lockaspectratio ) } } -::sal_Bool SAL_CALL ScVbaShapeRange::getLockAnchor() throw (uno::RuntimeException) +::sal_Bool SAL_CALL ScVbaShapeRange::getLockAnchor() throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; /* ++index unreachable */ ) @@ -276,7 +276,7 @@ void SAL_CALL ScVbaShapeRange::setLockAspectRatio( ::sal_Bool _lockaspectratio ) throw uno::RuntimeException(); } -void SAL_CALL ScVbaShapeRange::setLockAnchor( ::sal_Bool _lockanchor ) throw (uno::RuntimeException) +void SAL_CALL ScVbaShapeRange::setLockAnchor( ::sal_Bool _lockanchor ) throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; ++index ) @@ -286,7 +286,7 @@ void SAL_CALL ScVbaShapeRange::setLockAnchor( ::sal_Bool _lockanchor ) throw (un } } -::sal_Int32 SAL_CALL ScVbaShapeRange::getRelativeHorizontalPosition() throw (uno::RuntimeException) +::sal_Int32 SAL_CALL ScVbaShapeRange::getRelativeHorizontalPosition() throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; /* ++index unreachable */ ) @@ -297,7 +297,7 @@ void SAL_CALL ScVbaShapeRange::setLockAnchor( ::sal_Bool _lockanchor ) throw (un throw uno::RuntimeException(); } -void SAL_CALL ScVbaShapeRange::setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (uno::RuntimeException) +void SAL_CALL ScVbaShapeRange::setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; ++index ) @@ -307,7 +307,7 @@ void SAL_CALL ScVbaShapeRange::setRelativeHorizontalPosition( ::sal_Int32 _relat } } -::sal_Int32 SAL_CALL ScVbaShapeRange::getRelativeVerticalPosition() throw (uno::RuntimeException) +::sal_Int32 SAL_CALL ScVbaShapeRange::getRelativeVerticalPosition() throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; /* ++index unreachable */ ) @@ -318,7 +318,7 @@ void SAL_CALL ScVbaShapeRange::setRelativeHorizontalPosition( ::sal_Int32 _relat throw uno::RuntimeException(); } -void SAL_CALL ScVbaShapeRange::setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (uno::RuntimeException) +void SAL_CALL ScVbaShapeRange::setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; ++index ) @@ -328,7 +328,7 @@ void SAL_CALL ScVbaShapeRange::setRelativeVerticalPosition( ::sal_Int32 _relativ } } -uno::Any SAL_CALL ScVbaShapeRange::TextFrame( ) throw (css::uno::RuntimeException) +uno::Any SAL_CALL ScVbaShapeRange::TextFrame( ) throw (css::uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; /* ++index unreachable */ ) @@ -339,7 +339,7 @@ uno::Any SAL_CALL ScVbaShapeRange::TextFrame( ) throw (css::uno::RuntimeExcepti throw uno::RuntimeException(); } -uno::Any SAL_CALL ScVbaShapeRange::WrapFormat( ) throw (css::uno::RuntimeException) +uno::Any SAL_CALL ScVbaShapeRange::WrapFormat( ) throw (css::uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; /* ++index unreachable */ ) @@ -350,7 +350,7 @@ uno::Any SAL_CALL ScVbaShapeRange::WrapFormat( ) throw (css::uno::RuntimeExcept throw uno::RuntimeException(); } -void SAL_CALL ScVbaShapeRange::ZOrder( sal_Int32 ZOrderCmd ) throw (uno::RuntimeException) +void SAL_CALL ScVbaShapeRange::ZOrder( sal_Int32 ZOrderCmd ) throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; ++index ) diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx index 5e5d3322d148..0a0cdbcc1ad2 100644 --- a/vbahelper/source/vbahelper/vbashapes.cxx +++ b/vbahelper/source/vbahelper/vbashapes.cxx @@ -49,11 +49,11 @@ class VbShapeEnumHelper : public EnumerationHelper_BASE sal_Int32 nIndex; public: VbShapeEnumHelper( const uno::Reference< msforms::XShapes >& xParent, const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xParent( xParent ), m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ScVbaShapes* pShapes = dynamic_cast< ScVbaShapes* >(m_xParent.get()); if ( pShapes && hasMoreElements() ) @@ -182,7 +182,7 @@ ScVbaShapes::Item( const uno::Any& Index, const uno::Any& Index2 ) throw (uno::R } uno::Reference< msforms::XShapeRange > SAL_CALL -ScVbaShapes::Range( const uno::Any& shapes ) throw (css::uno::RuntimeException) +ScVbaShapes::Range( const uno::Any& shapes ) throw (css::uno::RuntimeException, std::exception) { // shapes, can be an index or an array of indices uno::Reference< container::XIndexAccess > xShapes; @@ -201,7 +201,7 @@ ScVbaShapes::Range( const uno::Any& shapes ) throw (css::uno::RuntimeException) } void SAL_CALL -ScVbaShapes::SelectAll() throw (uno::RuntimeException) +ScVbaShapes::SelectAll() throw (uno::RuntimeException, std::exception) { uno::Reference< view::XSelectionSupplier > xSelectSupp( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); try @@ -302,7 +302,7 @@ ScVbaShapes::AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidt //helpeapi calc uno::Any SAL_CALL -ScVbaShapes::AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_Int32 endY ) throw (uno::RuntimeException) +ScVbaShapes::AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_Int32 endY ) throw (uno::RuntimeException, std::exception) { sal_Int32 nLineWidth = endX - StartX; sal_Int32 nLineHeight = endY - StartY; @@ -336,7 +336,7 @@ ScVbaShapes::AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_In } uno::Any SAL_CALL -ScVbaShapes::AddShape( sal_Int32 _nType, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException) +ScVbaShapes::AddShape( sal_Int32 _nType, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException, std::exception) { uno::Any _aAnchor; if (_nType == office::MsoAutoShapeType::msoShapeRectangle) @@ -351,7 +351,7 @@ ScVbaShapes::AddShape( sal_Int32 _nType, sal_Int32 _nLeft, sal_Int32 _nTop, sal_ } uno::Any SAL_CALL -ScVbaShapes::AddTextbox( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException) +ScVbaShapes::AddTextbox( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException, std::exception) { uno::Reference< lang::XServiceInfo > xServiceInfo( m_xModel, uno::UNO_QUERY_THROW ); if( xServiceInfo->supportsService( "com.sun.star.text.TextDocument" ) ) diff --git a/vbahelper/source/vbahelper/vbatextframe.cxx b/vbahelper/source/vbahelper/vbatextframe.cxx index a4c5f661fda6..8f3e2024cc22 100644 --- a/vbahelper/source/vbahelper/vbatextframe.cxx +++ b/vbahelper/source/vbahelper/vbatextframe.cxx @@ -55,7 +55,7 @@ void VbaTextFrame::setMargin( OUString sMarginType, float fMargin ) // Attributes sal_Bool SAL_CALL -VbaTextFrame::getAutoSize() throw (uno::RuntimeException) +VbaTextFrame::getAutoSize() throw (uno::RuntimeException, std::exception) { // I don't know why, but in OOo, TextAutoGrowHeight is the property control autosize. not TextFitToSize. // TextFitToSize control the text content. @@ -67,14 +67,14 @@ VbaTextFrame::getAutoSize() throw (uno::RuntimeException) } void SAL_CALL -VbaTextFrame::setAutoSize( sal_Bool _autosize ) throw (uno::RuntimeException) +VbaTextFrame::setAutoSize( sal_Bool _autosize ) throw (uno::RuntimeException, std::exception) { setAsMSObehavior(); m_xPropertySet->setPropertyValue( "TextAutoGrowHeight", uno::makeAny( _autosize ) ); } float SAL_CALL -VbaTextFrame::getMarginBottom() throw (uno::RuntimeException) +VbaTextFrame::getMarginBottom() throw (uno::RuntimeException, std::exception) { sal_Int32 nMargin = getMargin( "TextLowerDistance" ); float fMargin = (float)Millimeter::getInPoints( nMargin ); @@ -82,13 +82,13 @@ VbaTextFrame::getMarginBottom() throw (uno::RuntimeException) } void SAL_CALL -VbaTextFrame::setMarginBottom( float _marginbottom ) throw (uno::RuntimeException) +VbaTextFrame::setMarginBottom( float _marginbottom ) throw (uno::RuntimeException, std::exception) { setMargin( "TextLowerDistance", _marginbottom ); } float SAL_CALL -VbaTextFrame::getMarginTop() throw (uno::RuntimeException) +VbaTextFrame::getMarginTop() throw (uno::RuntimeException, std::exception) { sal_Int32 nMargin = getMargin( "TextUpperDistance" ); float fMargin = (float)Millimeter::getInPoints( nMargin ); @@ -96,13 +96,13 @@ VbaTextFrame::getMarginTop() throw (uno::RuntimeException) } void SAL_CALL -VbaTextFrame::setMarginTop( float _margintop ) throw (uno::RuntimeException) +VbaTextFrame::setMarginTop( float _margintop ) throw (uno::RuntimeException, std::exception) { setMargin( "TextUpperDistance", _margintop ); } float SAL_CALL -VbaTextFrame::getMarginLeft() throw (uno::RuntimeException) +VbaTextFrame::getMarginLeft() throw (uno::RuntimeException, std::exception) { sal_Int32 nMargin = getMargin( "TextLeftDistance" ); float fMargin = (float)Millimeter::getInPoints( nMargin ); @@ -110,13 +110,13 @@ VbaTextFrame::getMarginLeft() throw (uno::RuntimeException) } void SAL_CALL -VbaTextFrame::setMarginLeft( float _marginleft ) throw (uno::RuntimeException) +VbaTextFrame::setMarginLeft( float _marginleft ) throw (uno::RuntimeException, std::exception) { setMargin( "TextLeftDistance", _marginleft ); } float SAL_CALL -VbaTextFrame::getMarginRight() throw (uno::RuntimeException) +VbaTextFrame::getMarginRight() throw (uno::RuntimeException, std::exception) { sal_Int32 nMargin = getMargin( "TextRightDistance" ); float fMargin = (float)Millimeter::getInPoints( nMargin ); @@ -124,7 +124,7 @@ VbaTextFrame::getMarginRight() throw (uno::RuntimeException) } void SAL_CALL -VbaTextFrame::setMarginRight( float _marginright ) throw (uno::RuntimeException) +VbaTextFrame::setMarginRight( float _marginright ) throw (uno::RuntimeException, std::exception) { setMargin( "TextRightDistance" , _marginright ); } @@ -132,7 +132,7 @@ VbaTextFrame::setMarginRight( float _marginright ) throw (uno::RuntimeException) // Methods uno::Any SAL_CALL -VbaTextFrame::Characters() throw (uno::RuntimeException) +VbaTextFrame::Characters() throw (uno::RuntimeException, std::exception) { throw uno::RuntimeException( "Not implemented" , uno::Reference< uno::XInterface >() ); } diff --git a/vbahelper/source/vbahelper/vbawindowbase.cxx b/vbahelper/source/vbahelper/vbawindowbase.cxx index a25681716fee..edb13508ae59 100644 --- a/vbahelper/source/vbahelper/vbawindowbase.cxx +++ b/vbahelper/source/vbahelper/vbawindowbase.cxx @@ -44,13 +44,13 @@ VbaWindowBase::VbaWindowBase( uno::Sequence< uno::Any > const & args, } sal_Bool SAL_CALL -VbaWindowBase::getVisible() throw (uno::RuntimeException) +VbaWindowBase::getVisible() throw (uno::RuntimeException, std::exception) { return getWindow2()->isVisible(); } void SAL_CALL -VbaWindowBase::setVisible( sal_Bool _visible ) throw (uno::RuntimeException) +VbaWindowBase::setVisible( sal_Bool _visible ) throw (uno::RuntimeException, std::exception) { getWindow2()->setVisible( _visible ); } @@ -78,49 +78,49 @@ void setPosSize( const uno::Reference< awt::XWindow >& xWindow, sal_Int32 nValue } sal_Int32 SAL_CALL -VbaWindowBase::getHeight() throw (uno::RuntimeException) +VbaWindowBase::getHeight() throw (uno::RuntimeException, std::exception) { return getWindow()->getPosSize().Height; } void SAL_CALL -VbaWindowBase::setHeight( sal_Int32 _height ) throw (uno::RuntimeException) +VbaWindowBase::setHeight( sal_Int32 _height ) throw (uno::RuntimeException, std::exception) { setPosSize( getWindow(), _height, css::awt::PosSize::HEIGHT ); } sal_Int32 SAL_CALL -VbaWindowBase::getLeft() throw (uno::RuntimeException) +VbaWindowBase::getLeft() throw (uno::RuntimeException, std::exception) { return getWindow()->getPosSize().X; } void SAL_CALL -VbaWindowBase::setLeft( sal_Int32 _left ) throw (uno::RuntimeException) +VbaWindowBase::setLeft( sal_Int32 _left ) throw (uno::RuntimeException, std::exception) { setPosSize( getWindow(), _left, css::awt::PosSize::X ); } sal_Int32 SAL_CALL -VbaWindowBase::getTop() throw (uno::RuntimeException) +VbaWindowBase::getTop() throw (uno::RuntimeException, std::exception) { return getWindow()->getPosSize().Y; } void SAL_CALL -VbaWindowBase::setTop( sal_Int32 _top ) throw (uno::RuntimeException) +VbaWindowBase::setTop( sal_Int32 _top ) throw (uno::RuntimeException, std::exception) { setPosSize( getWindow(), _top, css::awt::PosSize::Y ); } sal_Int32 SAL_CALL -VbaWindowBase::getWidth() throw (uno::RuntimeException) +VbaWindowBase::getWidth() throw (uno::RuntimeException, std::exception) { return getWindow()->getPosSize().Width; } void SAL_CALL -VbaWindowBase::setWidth( sal_Int32 _width ) throw (uno::RuntimeException) +VbaWindowBase::setWidth( sal_Int32 _width ) throw (uno::RuntimeException, std::exception) { setPosSize( getWindow(), _width, css::awt::PosSize::WIDTH ); } |