diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2011-12-11 18:51:50 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2011-12-12 10:05:25 +0900 |
commit | 75b835c8cd2953c5bc0f23df300ee553f94eb28d (patch) | |
tree | 753bf89fdc56cd3df9842adc7962b0965090cf44 /filter/source/msfilter | |
parent | fix automatic download of dlls on windows (diff) | |
download | core-75b835c8cd2953c5bc0f23df300ee553f94eb28d.tar.gz core-75b835c8cd2953c5bc0f23df300ee553f94eb28d.zip |
catch exception by constant reference
Diffstat (limited to 'filter/source/msfilter')
-rw-r--r-- | filter/source/msfilter/escherex.cxx | 10 | ||||
-rw-r--r-- | filter/source/msfilter/eschesdo.cxx | 4 | ||||
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 6 | ||||
-rw-r--r-- | filter/source/msfilter/msoleexp.cxx | 14 | ||||
-rw-r--r-- | filter/source/msfilter/mstoolbar.cxx | 4 | ||||
-rw-r--r-- | filter/source/msfilter/msvbahelper.cxx | 6 | ||||
-rw-r--r-- | filter/source/msfilter/powerpoint/pptimporter.cxx | 2 | ||||
-rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 10 |
8 files changed, 28 insertions, 28 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 0bad56292aca..10f17706357d 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -2058,7 +2058,7 @@ void ConvertEnhancedCustomShapeEquation( SdrObjCustomShape* pCustoShape, rEquations.push_back( aEquation ); } } - catch ( EnhancedCustomShape::ParseError& ) + catch ( const EnhancedCustomShape::ParseError& ) { EnhancedCustomShapeEquation aEquation; // ups, we should not be here, aEquation.nOperation = 0; // creating a default equation with value 1 @@ -3277,7 +3277,7 @@ MSO_SPT EscherPropertyContainer::GetCustomShapeType( const uno::Reference< drawi } } } - catch( ::com::sun::star::uno::Exception& ) + catch( const ::com::sun::star::uno::Exception& ) { } } @@ -3386,7 +3386,7 @@ sal_Bool EscherPropertyValueHelper::GetPropertyValue( if ( aXPropSetInfo.is() ) bRetValue = aXPropSetInfo->hasPropertyByName( rString ); } - catch( ::com::sun::star::uno::Exception& ) + catch( const ::com::sun::star::uno::Exception& ) { bRetValue = sal_False; } @@ -3399,7 +3399,7 @@ sal_Bool EscherPropertyValueHelper::GetPropertyValue( if ( !rAny.hasValue() ) bRetValue = sal_False; } - catch( ::com::sun::star::uno::Exception& ) + catch( const ::com::sun::star::uno::Exception& ) { bRetValue = sal_False; } @@ -3419,7 +3419,7 @@ sal_Bool EscherPropertyValueHelper::GetPropertyValue( if ( aXPropState.is() ) eRetValue = aXPropState->getPropertyState( rPropertyName ); } - catch( ::com::sun::star::uno::Exception& ) + catch( const ::com::sun::star::uno::Exception& ) { } return eRetValue; diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 0180e37b2875..438a72d44afe 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -1066,7 +1066,7 @@ sal_Bool ImplEESdrObject::ImplGetPropertyValue( const sal_Unicode* rString ) if( mAny.hasValue() ) bRetValue = sal_True; } - catch( ::com::sun::star::uno::Exception& ) + catch( const ::com::sun::star::uno::Exception& ) { bRetValue = sal_False; } @@ -1087,7 +1087,7 @@ sal_Bool ImplEESdrObject::ImplGetPropertyValue( const Reference< XPropertySet >& if( 0 != mAny.get() ) bRetValue = sal_True; } - catch( ::com::sun::star::uno::Exception& ) + catch( const ::com::sun::star::uno::Exception& ) { bRetValue = sal_False; } diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 6853c139ebd2..e9d177b0a79f 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -7554,7 +7554,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage( xObj->setVisualAreaSize( nAspect, aAwtSz ); //xInplaceObj->EnableSetModified( sal_True );*/ } - catch( uno::Exception& ) + catch( const uno::Exception& ) { OSL_FAIL( "Could not set visual area of the object!\n" ); } @@ -7601,7 +7601,7 @@ sal_Bool SvxMSDffManager::SetPropValue( const uno::Any& rAny, const uno::Referen if ( aXPropSetInfo.is() ) bRetValue = aXPropSetInfo->hasPropertyByName( rPropName ); } - catch( uno::Exception& ) + catch( const uno::Exception& ) { bRetValue = sal_False; } @@ -7613,7 +7613,7 @@ sal_Bool SvxMSDffManager::SetPropValue( const uno::Any& rAny, const uno::Referen rXPropSet->setPropertyValue( rPropName, rAny ); bRetValue = sal_True; } - catch( uno::Exception& ) + catch( const uno::Exception& ) { bRetValue = sal_False; } diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx index e69ae3be3d3b..9915f1420139 100644 --- a/filter/source/msfilter/msoleexp.cxx +++ b/filter/source/msfilter/msoleexp.cxx @@ -117,7 +117,7 @@ sal_Bool UseOldMSExport() return bResult; } } - catch( uno::Exception& ) + catch( const uno::Exception& ) { } @@ -215,13 +215,13 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto { xStor->storeToURL( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:stream" )), aSeq ); } - catch( uno::Exception& ) {} // #TODO really handle exceptions - interactionalhandler etc. ? + catch( const uno::Exception& ) {} // #TODO really handle exceptions - interactionalhandler etc. ? SotStorageRef xOLEStor = new SotStorage( pStream, sal_True ); xOLEStor->CopyTo( &rDestStg ); rDestStg.Commit(); } - catch( uno::Exception& ) + catch( const uno::Exception& ) { // TODO/LATER: Error handling OSL_FAIL( "The object could not be exported!" ); @@ -257,13 +257,13 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto // extension stream aSize = rObj->getVisualAreaSize( embed::Aspects::MSOLE_CONTENT ); } - catch( embed::NoVisualAreaSizeException& ) + catch( const embed::NoVisualAreaSizeException& ) { OSL_FAIL( "Could not get visual area size!\n" ); aSize.Width = 5000; aSize.Height = 5000; } - catch( uno::Exception& ) + catch( const uno::Exception& ) { OSL_FAIL( "Unexpected exception while getting visual area size!\n" ); aSize.Width = 5000; @@ -311,7 +311,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto uno::Reference < frame::XStorable > xStor( rObj->getComponent(), uno::UNO_QUERY ); xStor->storeToURL( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:stream" )), aSeq ); } - catch( uno::Exception& ) + catch( const uno::Exception& ) { // TODO/LATER: Error handling OSL_FAIL( "The object could not be exported!" ); @@ -339,7 +339,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto { xPers->storeToEntry( xStor, aTempName, aEmptySeq, aEmptySeq ); } - catch ( uno::Exception& ) + catch ( const uno::Exception& ) {} SotStorageRef xOLEStor = SotStorage::OpenOLEStorage( xStor, aTempName, STREAM_STD_READ ); diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx index 83e4dd44fe4a..2776e724d1f5 100644 --- a/filter/source/msfilter/mstoolbar.cxx +++ b/filter/source/msfilter/mstoolbar.cxx @@ -61,7 +61,7 @@ void CustomToolBarImportHelper::showToolbar( const rtl::OUString& rName ) uno::Reference< frame::XLayoutManager > xLayoutMgr( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LayoutManager") ) ), uno::UNO_QUERY_THROW ); xLayoutMgr->showElement( rName ); } - catch( uno::Exception& ) {} + catch( const uno::Exception& ) {} } void CustomToolBarImportHelper::ScaleImage( uno::Reference< graphic::XGraphic >& xGraphic, long nNewSize ) @@ -192,7 +192,7 @@ CustomToolBarImportHelper::createMenu( const rtl::OUString& rName, const uno::Re } } } - catch( uno::Exception& ) + catch( const uno::Exception& ) { bRes = false; } diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index ca0288fb6364..ca7f34d22c76 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -323,7 +323,7 @@ MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString& { xPrjNameCache.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAProjectNameProvider" ) ) ), uno::UNO_QUERY ); } - catch( uno::Exception& ) // createInstance may throw + catch( const uno::Exception& ) // createInstance may throw { } #endif @@ -358,7 +358,7 @@ MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString& uno::Reference< script::vba::XVBACompatibility > xVBAMode( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW ); sThisProject = xVBAMode->getProjectName(); } - catch( uno::Exception& /*e*/) {} + catch( const uno::Exception& /*e*/) {} sSearchList.push_back( sThisProject ); // First Lib to search @@ -465,7 +465,7 @@ sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, uno::Se } bRes = ( nErr == ERRCODE_NONE ); } - catch ( uno::Exception& ) + catch ( const uno::Exception& ) { bRes = sal_False; } diff --git a/filter/source/msfilter/powerpoint/pptimporter.cxx b/filter/source/msfilter/powerpoint/pptimporter.cxx index 23760b68d8cd..713e1d32ff1e 100644 --- a/filter/source/msfilter/powerpoint/pptimporter.cxx +++ b/filter/source/msfilter/powerpoint/pptimporter.cxx @@ -67,7 +67,7 @@ PptImporter::PptImporter( const REF( NMSP_LANG::XMultiServiceFactory )& rxMgr ) xHdl = REF( NMSP_SAX::XDocumentHandler ) ( xFact->createInstance( sService ), NMSP_UNO::UNO_QUERY ); xImporter = REF( NMSP_DOCUMENT::XImporter )( xHdl, NMSP_UNO::UNO_QUERY ); } - catch( NMSP_UNO::Exception & ) + catch( const NMSP_UNO::Exception & ) { } } diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 0cd57668c263..5e5726661284 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2719,7 +2719,7 @@ void ImportComment10( SvxMSDffManager& rMan, SvStream& rStCtrl, SdrPage* pPage, uno::Reference< text::XText > xText( xAnnotation->getTextRange() ); xText->setString( sText ); } - catch( uno::Exception& ) + catch( const uno::Exception& ) { } @@ -7206,7 +7206,7 @@ void MergeCells( const Reference< XTable >& xTable, sal_Int32 nCol, sal_Int32 nR if( xRange->isMergeable() ) xRange->merge(); } - catch( Exception& ) + catch( const Exception& ) { DBG_ASSERT( false, "exception caught!" ); } @@ -7311,7 +7311,7 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) } } } - catch( Exception& ) + catch( const Exception& ) { } } @@ -7376,7 +7376,7 @@ void ApplyCellLineAttributes( const SdrObject* pLine, Reference< XTable >& xTabl ++aIter; } } - catch( Exception& ) + catch( const Exception& ) { } } @@ -7516,7 +7516,7 @@ SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTab SdrObject::Free( pGroup ); } - catch( Exception& ) + catch( const Exception& ) { pTable->uno_unlock(); SdrObject* pObj = pTable; |