diff options
Diffstat (limited to 'vbahelper/source/msforms')
38 files changed, 486 insertions, 486 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(); |