mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oox: make things easier to debug by tracing exceptions

Browse Source 
Change-Id: I05df8435874eb65f3acedaaea50b4910e9fc9111
This commit is contained in:
Michael Stahl
2012-11-09 00:20:11 +01:00
parent 8cd6a947d9
commit 5f78685ebf
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
oox/source/ole/axcontrol.cxx
View File

@@ -194,8 +194,9 @@ bool lclExtractRangeFromName( CellRangeAddress& orRangeAddr, const Reference< XM
orRangeAddr = xAddressable->getRangeAddress(); orRangeAddr = xAddressable->getRangeAddress();
return true; return true;
} }
catch(const Exception& ) catch (const Exception& e)
{ {
SAL_WARN("oox", "exception: " << e.Message);
} }
return false; return false;
} }
@@ -226,8 +227,9 @@ void lclPrepareConverter( PropertySet& rConverter, const Reference< XModel >& rx
CREATE_OUSTRING( "com.sun.star.table.CellAddressConversion" ); CREATE_OUSTRING( "com.sun.star.table.CellAddressConversion" );
rConverter.set( xModelFactory->createInstance( aServiceName ) ); rConverter.set( xModelFactory->createInstance( aServiceName ) );
} }
catch(const Exception& ) catch (const Exception& e)
{ {
SAL_WARN("oox", "exception: " << e.Message);
} }
rConverter.setProperty( PROP_XLA1Representation, rAddressString ); rConverter.setProperty( PROP_XLA1Representation, rAddressString );
rConverter.setProperty( PROP_ReferenceSheet, nRefSheet ); rConverter.setProperty( PROP_ReferenceSheet, nRefSheet );
@@ -372,8 +374,9 @@ void ControlConverter::bindToSources( const Reference< XControlModel >& rxCtrlMo
CREATE_OUSTRING( "com.sun.star.table.CellValueBinding" ), aArgs ), UNO_QUERY_THROW ); CREATE_OUSTRING( "com.sun.star.table.CellValueBinding" ), aArgs ), UNO_QUERY_THROW );
xBindable->setValueBinding( xBinding ); xBindable->setValueBinding( xBinding );
} }
catch(const Exception& ) catch (const Exception& e)
{ {
SAL_WARN("oox", "exception: " << e.Message);
} }
// list entry source // list entry source
@@ -404,8 +407,9 @@ void ControlConverter::bindToSources( const Reference< XControlModel >& rxCtrlMo
CREATE_OUSTRING( "com.sun.star.table.CellRangeListSource" ), aArgs ), UNO_QUERY_THROW ); CREATE_OUSTRING( "com.sun.star.table.CellRangeListSource" ), aArgs ), UNO_QUERY_THROW );
xEntrySink->setListEntrySource( xEntrySource ); xEntrySink->setListEntrySource( xEntrySource );
} }
catch(const Exception& ) catch (const Exception& e)
{ {
SAL_WARN("oox", "exception: " << e.Message);
} }
} }
@@ -2554,8 +2558,9 @@ bool EmbeddedControl::convertProperties( const Reference< XControlModel >& rxCtr
{ {
aPropMap.setProperty( PROP_GenerateVbaEvents, true); aPropMap.setProperty( PROP_GenerateVbaEvents, true);
} }
catch(const Exception& ) catch (const Exception& e)
{ {
SAL_WARN("oox", "exception: " << e.Message);
} }
mxModel->convertProperties( aPropMap, rConv ); mxModel->convertProperties( aPropMap, rConv );
PropertySet aPropSet( rxCtrlModel ); PropertySet aPropSet( rxCtrlModel );
@@ -2606,8 +2611,9 @@ Reference< XControlModel > EmbeddedForm::convertAndInsert( const EmbeddedControl
if( rControl.convertProperties( xCtrlModel, maControlConv ) ) if( rControl.convertProperties( xCtrlModel, maControlConv ) )
return xCtrlModel; return xCtrlModel;
} }
catch(const Exception& ) catch (const Exception& e)
{ {
SAL_WARN("oox", "exception creating Control: " << e.Message);
} }
return Reference< XControlModel >(); return Reference< XControlModel >();
} }
@@ -2631,8 +2637,9 @@ Reference< XIndexContainer > EmbeddedForm::createXForm()
mxFormIC.set( xForm, UNO_QUERY_THROW ); mxFormIC.set( xForm, UNO_QUERY_THROW );
} }
} }
catch(const Exception& ) catch (const Exception& e)
{ {
SAL_WARN("oox", "exception creating Form: " << e.Message);
} }
// always clear the forms supplier to not try to create the form again // always clear the forms supplier to not try to create the form again
mxFormsSupp.clear(); mxFormsSupp.clear();

3
oox/source/vml/vmldrawing.cxx
View File

@@ -253,8 +253,9 @@ Reference< XShape > Drawing::createAndInsertXControlShape( const ::oox::ole::Emb
// set the control model at the shape // set the control model at the shape
Reference< XControlShape >( xShape, UNO_QUERY_THROW )->setControl( xCtrlModel ); Reference< XControlShape >( xShape, UNO_QUERY_THROW )->setControl( xCtrlModel );
} }
catch( Exception& ) catch (Exception const& e)
{ {
SAL_WARN("oox", "exception inserting Shape: " << e.Message);
} }
return xShape; return xShape;
} }