diff options
author | Noel Grandin <noel@peralex.com> | 2014-05-23 12:03:21 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-05-23 15:06:00 +0200 |
commit | e7bc3cab019fbf040f9fb8b53ae2cf3f977d200b (patch) | |
tree | bc507bccee9fb71134e362b72d22991561e32aa0 /vbahelper | |
parent | c5d47c327a57df55fa3dac0fff6b65888d0345e4 (diff) |
remove boilerplate in UNO Exception constructor calls
Now that we have default values for Exception constructor params,
remove lots of boilerplate code.
Change-Id: I620bd641eecfed38e6123873b3b94aaf47922e74
Diffstat (limited to 'vbahelper')
-rw-r--r-- | vbahelper/source/msforms/vbacontrol.cxx | 6 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbalistbox.cxx | 10 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbalistcontrolhelper.cxx | 6 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbaapplicationbase.cxx | 8 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbacolorformat.cxx | 4 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbacommandbarcontrols.cxx | 4 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbacommandbarhelper.cxx | 2 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbacommandbars.cxx | 4 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbadialogbase.cxx | 4 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbadocumentbase.cxx | 4 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbadocumentsbase.cxx | 2 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbahelper.cxx | 10 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbalineformat.cxx | 22 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbapictureformat.cxx | 4 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbashape.cxx | 16 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbashapes.cxx | 2 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbatextframe.cxx | 2 |
17 files changed, 53 insertions, 57 deletions
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index 938b93b4c322..c3ad1300e9b8 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -88,7 +88,7 @@ ScVbaControl::getWindowPeer() throw (uno::RuntimeException) } catch(const uno::Exception&) { - throw uno::RuntimeException( "The Control does not exsit" , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "The Control does not exist" ); } return xWinPeer; } @@ -642,7 +642,7 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 /*nTabIndex*/ ) throw (uno::R case form::FormComponentType::SCROLLBAR: return new ScVbaScrollBar( xVbaParent, xContext, xControlShape, xModel, xGeoHelper.release() ); } - throw uno::RuntimeException( "Unsupported control." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Unsupported control." ); } /*static*/ uno::Reference< msforms::XControl > ScVbaControlFactory::createUserformControl( @@ -700,7 +700,7 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 /*nTabIndex*/ ) throw (uno::R xVBAControl.set( new ScVbaFrame( xVbaParent, xContext, xControl, xModel, xGeoHelper.release(), xDialog ) ); if( xVBAControl.is() ) return xVBAControl; - throw uno::RuntimeException( "Unsupported control." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Unsupported control." ); } OUString diff --git a/vbahelper/source/msforms/vbalistbox.cxx b/vbahelper/source/msforms/vbalistbox.cxx index 2b4ea399c073..491601833e68 100644 --- a/vbahelper/source/msforms/vbalistbox.cxx +++ b/vbahelper/source/msforms/vbalistbox.cxx @@ -62,7 +62,7 @@ ScVbaListBox::getValue() throw (uno::RuntimeException, std::exception) m_xProps->getPropertyValue( "SelectedItems" ) >>= sSelection; m_xProps->getPropertyValue( "StringItemList" ) >>= sItems; if( getMultiSelect() ) - throw uno::RuntimeException( "Attribute use invalid." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Attribute use invalid." ); uno::Any aRet; if ( sSelection.getLength() ) aRet = uno::makeAny( sItems[ sSelection[ 0 ] ] ); @@ -74,7 +74,7 @@ ScVbaListBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException, s { if( getMultiSelect() ) { - throw uno::RuntimeException( "Attribute use invalid." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Attribute use invalid." ); } OUString sValue = getAnyAsString( _value ); uno::Sequence< OUString > sList; @@ -91,7 +91,7 @@ ScVbaListBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException, s } } if( nValue == -1 ) - throw uno::RuntimeException( "Attribute use invalid." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Attribute use invalid." ); uno::Sequence< sal_Int16 > nSelectedIndices(1); uno::Sequence< sal_Int16 > nOldSelectedIndices; @@ -156,7 +156,7 @@ ScVbaListBox::Selected( sal_Int32 index ) throw (css::uno::RuntimeException, std // the indices are but sal_Int16 sal_Int16 nIndex = static_cast< sal_Int16 >( index ); if( nIndex < 0 || nIndex >= nLength ) - throw uno::RuntimeException( "Error Number." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Error Number." ); m_nIndex = nIndex; return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( this ) ) ); } @@ -189,7 +189,7 @@ ScVbaListBox::setValueEvent( const uno::Any& value ) { bool bValue = false; if( !(value >>= bValue) ) - throw uno::RuntimeException( "Invalid type\n. need boolean." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Invalid type. need boolean." ); uno::Sequence< sal_Int16 > nList; m_xProps->getPropertyValue( "SelectedItems" ) >>= nList; sal_Int16 nLength = static_cast<sal_Int16>( nList.getLength() ); diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.cxx b/vbahelper/source/msforms/vbalistcontrolhelper.cxx index c00cd6b6e11c..a93427f1fb9d 100644 --- a/vbahelper/source/msforms/vbalistcontrolhelper.cxx +++ b/vbahelper/source/msforms/vbalistcontrolhelper.cxx @@ -45,7 +45,7 @@ ListPropListener::ListPropListener( const uno::Reference< beans::XPropertySet >& void ListPropListener::setValueEvent( const uno::Any& value ) { if( m_pvargIndex.hasValue() || m_pvarColumn.hasValue() ) - throw uno::RuntimeException( "Bad argument" , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Bad argument" ); m_xProps->setPropertyValue( "StringItemList", value ); } @@ -61,11 +61,11 @@ uno::Any ListPropListener::getValueEvent() sal_Int16 nIndex = -1; m_pvargIndex >>= nIndex; if( nIndex < 0 || nIndex >= nLength ) - throw uno::RuntimeException( "Bad row Index" , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Bad row Index" ); aRet <<= sList[ nIndex ]; } else if ( m_pvarColumn.hasValue() ) // pvarColumn on its own would be bad - throw uno::RuntimeException( "Bad column Index" , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Bad column Index" ); else // List() ( e.g. no args ) { uno::Sequence< uno::Sequence< OUString > > sReturnArray( nLength ); diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index 0c8e90a47db3..7110e7cf89cc 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -97,7 +97,7 @@ public: void Start( const ::rtl::Reference< VbaApplicationBase > xBase, const OUString& aFunction, double nFrom, double nTo ) { if ( !xBase.is() || aFunction.isEmpty() ) - throw uno::RuntimeException( "Unexpected arguments!" , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Unexpected arguments!" ); m_xBase = xBase; m_aTimerInfo = VbaTimerInfo( aFunction, ::std::pair< double, double >( nFrom, nTo ) ); @@ -348,7 +348,7 @@ uno::Any SAL_CALL VbaApplicationBase::Run( const OUString& MacroName, const uno: } else { - throw uno::RuntimeException( "The macro doesn't exist" , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "The macro doesn't exist" ); } } @@ -356,13 +356,13 @@ void SAL_CALL VbaApplicationBase::OnTime( const uno::Any& aEarliestTime, const O throw ( uno::RuntimeException, std::exception ) { if ( aFunction.isEmpty() ) - throw uno::RuntimeException( "Unexpected function name!" , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Unexpected function name!" ); double nEarliestTime = 0; double nLatestTime = 0; if ( !( aEarliestTime >>= nEarliestTime ) || ( aLatestTime.hasValue() && !( aLatestTime >>= nLatestTime ) ) ) - throw uno::RuntimeException( "Only double is supported as time for now!" , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Only double is supported as time for now!" ); bool bSetTimer = true; aSchedule >>= bSetTimer; diff --git a/vbahelper/source/vbahelper/vbacolorformat.cxx b/vbahelper/source/vbahelper/vbacolorformat.cxx index e50a3b4a09ac..f3b49468ced0 100644 --- a/vbahelper/source/vbahelper/vbacolorformat.cxx +++ b/vbahelper/source/vbahelper/vbacolorformat.cxx @@ -75,7 +75,7 @@ ScVbaColorFormat::getRGB() throw (uno::RuntimeException, std::exception) nRGB = m_nFillFormatBackColor; break; default: - throw uno::RuntimeException( "Second parameter of ColorFormat is wrong." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Second parameter of ColorFormat is wrong." ); } nRGB = OORGBToXLRGB( nRGB ); return nRGB; @@ -108,7 +108,7 @@ ScVbaColorFormat::setRGB( sal_Int32 _rgb ) throw (uno::RuntimeException, std::ex } break; default: - throw uno::RuntimeException( "Second parameter of ColorFormat is wrong." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Second parameter of ColorFormat is wrong." ); } } diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx index 8696075b241f..7f3ab371e7e1 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx @@ -181,11 +181,11 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const un if( nType != office::MsoControlType::msoControlButton && nType != office::MsoControlType::msoControlPopup ) - throw uno::RuntimeException( "Not implemented" , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Not implemented" ); if( Id.hasValue() || Parameter.hasValue( ) ) { - throw uno::RuntimeException( "Not implemented" , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Not implemented" ); } if( Before.hasValue() ) diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx index 403d592b6b37..0c35ebc5018f 100644 --- a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx @@ -107,7 +107,7 @@ void VbaCommandBarHelper::Init( ) throw (css::uno::RuntimeException) if( maModuleId.isEmpty() ) { - throw uno::RuntimeException( "Not implemented" , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Not implemented" ); } css::uno::Reference< css::ui::XModuleUIConfigurationManagerSupplier > xUICfgMgrSupp( diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx index d55b79792ff8..9993979d888e 100644 --- a/vbahelper/source/vbahelper/vbacommandbars.cxx +++ b/vbahelper/source/vbahelper/vbacommandbars.cxx @@ -151,7 +151,7 @@ ScVbaCommandBars::createCollectionObject( const uno::Any& aSource ) } if( !aRet.hasValue() ) - throw uno::RuntimeException( "Toolbar do not exist" , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Toolbar do not exist" ); return aRet; } @@ -172,7 +172,7 @@ ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Positio { sResourceUrl = m_pCBarHelper->findToolbarByName( m_xNameAccess, sName ); if( !sResourceUrl.isEmpty() ) - throw uno::RuntimeException( "Toolbar exists" , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Toolbar exists" ); } else { diff --git a/vbahelper/source/vbahelper/vbadialogbase.cxx b/vbahelper/source/vbahelper/vbadialogbase.cxx index 654adf3422c9..b988c6708abf 100644 --- a/vbahelper/source/vbahelper/vbadialogbase.cxx +++ b/vbahelper/source/vbahelper/vbadialogbase.cxx @@ -29,9 +29,7 @@ void SAL_CALL VbaDialogBase::Show() throw ( uno::RuntimeException, std::exceptio { aURL = mapIndexToName( mnIndex ); if( aURL.isEmpty() ) - throw uno::RuntimeException( - " Unable to open the specified dialog ", - uno::Reference< XInterface > () ); + throw uno::RuntimeException( "Unable to open the specified dialog" ); uno::Sequence< beans::PropertyValue > dispatchProps(0); dispatchRequests( m_xModel, aURL, dispatchProps ); diff --git a/vbahelper/source/vbahelper/vbadocumentbase.cxx b/vbahelper/source/vbahelper/vbadocumentbase.cxx index fb73b7b0fa93..21b5b05d1cba 100644 --- a/vbahelper/source/vbahelper/vbadocumentbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentbase.cxx @@ -114,7 +114,7 @@ VbaDocumentBase::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg, { if( xStorable->isReadonly() ) { - throw uno::RuntimeException("Unable to save to a read only file ", uno::Reference< XInterface >() ); + throw uno::RuntimeException("Unable to save to a read only file " ); } if( bFileName ) xStorable->storeAsURL( aFileName, uno::Sequence< beans::PropertyValue >(0) ); @@ -206,7 +206,7 @@ VbaDocumentBase::Unprotect( const uno::Any &aPassword ) throw (uno::RuntimeExcep OUString rPassword; uno::Reference< util::XProtectable > xProt( getModel(), uno::UNO_QUERY_THROW ); if( !xProt->isProtected() ) - throw uno::RuntimeException("File is already unprotected", uno::Reference< XInterface >() ); + throw uno::RuntimeException("File is already unprotected" ); else { if( aPassword >>= rPassword ) diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx index 591144d61301..6f8a6a83b918 100644 --- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx @@ -248,7 +248,7 @@ uno::Any VbaDocumentsBase::createDocument() throw (uno::RuntimeException) else if( meDocType == EXCEL_DOCUMENT ) sURL = "private:factory/scalc"; else - throw uno::RuntimeException( "Not implemented" , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Not implemented" ); // prepare the media descriptor utl::MediaDescriptor aMediaDesc; diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index aaf5defdbac4..517334d113e6 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -218,7 +218,7 @@ getCurrentDoc( const OUString& sKey ) throw (uno::RuntimeException) if ( !( aModel >>= xModel ) || !xModel.is() ) { throw uno::RuntimeException( - "Can't extract model from basic ( it's obviously not set yet therefore don't know the current document context)" , uno::Reference< uno::XInterface >() ); + "Can't extract model from basic ( it's obviously not set yet therefore don't know the current document context)" ); } else { @@ -228,9 +228,7 @@ getCurrentDoc( const OUString& sKey ) throw (uno::RuntimeException) else { SAL_INFO("vbahelper", "Failed to get " << sKey); - throw uno::RuntimeException( - "Can't determine the currently selected document" , - uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Can't determine the currently selected document" ); } return xModel; } @@ -810,7 +808,7 @@ UserFormGeometryHelper::UserFormGeometryHelper( mbDialog( uno::Reference< awt::XDialog >( xControl, uno::UNO_QUERY ).is() ) { if ( !xControl.is() ) - throw uno::RuntimeException( "No control is provided!", uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "No control is provided!" ); mxWindow.set( xControl->getPeer(), uno::UNO_QUERY_THROW ); mxModelProps.set( xControl->getModel(), uno::UNO_QUERY_THROW ); @@ -1009,7 +1007,7 @@ ShapeHelper::ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xS : xShape( _xShape ) { if( !xShape.is() ) - throw css::uno::RuntimeException( "No valid shape for helper" , css::uno::Reference< css::uno::XInterface >() ); + throw css::uno::RuntimeException( "No valid shape for helper" ); } double ShapeHelper::getHeight() const diff --git a/vbahelper/source/vbahelper/vbalineformat.cxx b/vbahelper/source/vbahelper/vbalineformat.cxx index 0a5c2e1f45c9..9412467fe6f9 100644 --- a/vbahelper/source/vbahelper/vbalineformat.cxx +++ b/vbahelper/source/vbahelper/vbalineformat.cxx @@ -91,7 +91,7 @@ ScVbaLineFormat::convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadSt case office::MsoArrowheadStyle::msoArrowheadTriangle: return OUString("Arrow"); default: - throw uno::RuntimeException( "Invalid Arrow Style!" , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Invalid Arrow Style!" ); } } @@ -128,7 +128,7 @@ ScVbaLineFormat::getBeginArrowheadLength() throw (uno::RuntimeException, std::ex { // #STUB // force error - throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." ); } void SAL_CALL @@ -136,7 +136,7 @@ ScVbaLineFormat::setBeginArrowheadLength( sal_Int32 /*_beginarrowheadlength*/ ) { // #STUB // force error - throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." ); } sal_Int32 SAL_CALL @@ -144,7 +144,7 @@ ScVbaLineFormat::getBeginArrowheadWidth() throw (uno::RuntimeException, std::exc { // #STUB // force error - throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." ); } void SAL_CALL @@ -152,7 +152,7 @@ ScVbaLineFormat::setBeginArrowheadWidth( sal_Int32 /*_beginarrowheadwidth*/ ) th { // #STUB // force error - throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." ); } sal_Int32 SAL_CALL @@ -173,28 +173,28 @@ ScVbaLineFormat::getEndArrowheadLength() throw (uno::RuntimeException, std::exce { // #STUB // force error - throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." ); } void SAL_CALL ScVbaLineFormat::setEndArrowheadLength( sal_Int32 /*_endarrowheadlength*/ ) throw (uno::RuntimeException, std::exception) { // #STUB - throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." ); } sal_Int32 SAL_CALL ScVbaLineFormat::getEndArrowheadWidth() throw (uno::RuntimeException, std::exception) { // #STUB - throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." ); } void SAL_CALL ScVbaLineFormat::setEndArrowheadWidth( sal_Int32 /*_endarrowheadwidth*/ ) throw (uno::RuntimeException, std::exception) { // #STUB - throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." ); } double SAL_CALL @@ -210,7 +210,7 @@ void SAL_CALL ScVbaLineFormat::setWeight( double _weight ) throw (uno::RuntimeException, std::exception) { if( _weight < 0 ) - throw uno::RuntimeException( "Parameter: Must be positive." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Parameter: Must be positive." ); if( _weight == 0 ) _weight = 0.5; m_nLineWeight = _weight; @@ -405,7 +405,7 @@ ScVbaLineFormat::setDashStyle( sal_Int32 _dashstyle ) throw (uno::RuntimeExcepti pLineDash.Distance = nPixel; break; default: - throw uno::RuntimeException( "this MsoLineDashStyle is not supported." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "this MsoLineDashStyle is not supported." ); } m_xPropertySet->setPropertyValue( "LineDash" , uno::makeAny( pLineDash ) ); } diff --git a/vbahelper/source/vbahelper/vbapictureformat.cxx b/vbahelper/source/vbahelper/vbapictureformat.cxx index 9ec4ba1dddfd..d3834caf0219 100644 --- a/vbahelper/source/vbahelper/vbapictureformat.cxx +++ b/vbahelper/source/vbahelper/vbapictureformat.cxx @@ -35,11 +35,11 @@ ScVbaPictureFormat::checkParameterRangeInDouble( double nRange, double nMin, dou { if( nRange < nMin ) { - throw uno::RuntimeException( "Parameter out of range, value is too small." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Parameter out of range, value is too small." ); } if( nRange > nMax ) { - throw uno::RuntimeException( "Parameter out of range, value is too high." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Parameter out of range, value is too high." ); } } diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx index 09e4cccc51fd..c48a2cab353f 100644 --- a/vbahelper/source/vbahelper/vbashape.cxx +++ b/vbahelper/source/vbahelper/vbashape.cxx @@ -149,7 +149,7 @@ ScVbaShape::getType( const css::uno::Reference< drawing::XShape > xShape ) throw else if( sShapeType == "com.sun.star.drawing.TextShape" ) return office::MsoShapeType::msoTextBox; else - throw uno::RuntimeException("the shape type do not be supported: " + sShapeType, uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException("the shape type do not be supported: " + sShapeType ); } // Attributes @@ -395,9 +395,9 @@ ScVbaShape::ZOrder( sal_Int32 ZOrderCmd ) throw (uno::RuntimeException, std::exc // below two commands use with Writer for text and image object. case office::MsoZOrderCmd::msoBringInFrontOfText: case office::MsoZOrderCmd::msoSendBehindText: - throw uno::RuntimeException( "This ZOrderCmd is not implemented, it is use with writer." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "This ZOrderCmd is not implemented, it is use with writer." ); default: - throw uno::RuntimeException( "Invalid Parameter." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Invalid Parameter." ); } } @@ -450,7 +450,7 @@ ScVbaShape::ScaleHeight( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal } else { - throw uno::RuntimeException( "ScaleHeight.Scale wrong value is given." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "ScaleHeight.Scale wrong value is given." ); } } @@ -479,7 +479,7 @@ ScVbaShape::ScaleWidth( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_ } else { - throw uno::RuntimeException( "ScaleHeight.Scale wrong value is given." , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "ScaleHeight.Scale wrong value is given." ); } } @@ -569,7 +569,7 @@ ScVbaShape::getRelativeHorizontalPosition() throw (uno::RuntimeException, std::e } default: { - throw uno::RuntimeException( "Shape::RelativeHorizontalPosition: not implemented" , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Shape::RelativeHorizontalPosition: not implemented" ); } } return nRelativeHorizontalPosition; @@ -641,7 +641,7 @@ ScVbaShape::getRelativeVerticalPosition() throw (uno::RuntimeException, std::exc } default: { - throw uno::RuntimeException( "Shape::RelativeVerticalPosition: not implemented" , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Shape::RelativeVerticalPosition: not implemented" ); } } return nRelativeVerticalPosition; @@ -695,7 +695,7 @@ ScVbaShape::WrapFormat() throw (uno::RuntimeException, std::exception) uno::Reference< uno::XInterface > xWrapFormat = xContext->getServiceManager()->createInstanceWithArgumentsAndContext( "ooo.vba.word.WrapFormat" , aArgs, xContext ); return uno::makeAny( xWrapFormat ); } - throw uno::RuntimeException( "Not implemented" , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Not implemented" ); } OUString diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx index b630eca180f0..200fdebea5ff 100644 --- a/vbahelper/source/vbahelper/vbashapes.cxx +++ b/vbahelper/source/vbahelper/vbashapes.cxx @@ -358,7 +358,7 @@ ScVbaShapes::AddTextbox( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _n { return AddTextboxInWriter( _nOrientation, _nLeft, _nTop, _nWidth, _nHeight ); } - throw uno::RuntimeException( "Not implemented" , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Not implemented" ); } uno::Any diff --git a/vbahelper/source/vbahelper/vbatextframe.cxx b/vbahelper/source/vbahelper/vbatextframe.cxx index 56c5874983b7..21b4abca77a3 100644 --- a/vbahelper/source/vbahelper/vbatextframe.cxx +++ b/vbahelper/source/vbahelper/vbatextframe.cxx @@ -134,7 +134,7 @@ VbaTextFrame::setMarginRight( float _marginright ) throw (uno::RuntimeException, uno::Any SAL_CALL VbaTextFrame::Characters() throw (uno::RuntimeException, std::exception) { - throw uno::RuntimeException( "Not implemented" , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( "Not implemented" ); } OUString |