diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-06-20 12:46:45 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-06-22 17:46:32 +0200 |
| commit | 6b199a3eef9faa2b9c7cb03c6e06679e203329d8 (patch) | |
| tree | 7cf5514126df69a740bb10675dbc5d6c75212eba /writerfilter | |
| parent | 18c20cbee35062539e2d03a89d1e1b806578a79d (diff) | |
n#758883 dmapper: set wrap mode even if determining the position failed
Change-Id: I514828469e68f2ae88309418e64ee93be30455f3
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/OLEHandler.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx index 9ef3364578c8..495d25b6de5f 100644 --- a/writerfilter/source/dmapper/OLEHandler.cxx +++ b/writerfilter/source/dmapper/OLEHandler.cxx @@ -108,24 +108,30 @@ void OLEHandler::lcl_attribute(Id rName, Value & rVal) if( xTempShape.is() ) { m_xShape.set( xTempShape ); + uno::Reference< beans::XPropertySet > xShapeProps( xTempShape, uno::UNO_QUERY ); + PropertyNameSupplier& rNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier(); try { m_aShapeSize = xTempShape->getSize(); m_aShapePosition = xTempShape->getPosition(); - uno::Reference< beans::XPropertySet > xShapeProps( xTempShape, uno::UNO_QUERY_THROW ); - PropertyNameSupplier& rNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier(); - xShapeProps->getPropertyValue( rNameSupplier.GetName( PROP_BITMAP ) ) >>= m_xReplacement; + } + catch( const uno::Exception& e ) + { + SAL_WARN("writerfilter", "Exception in OLE Handler: " << e.Message); + } + try + { xShapeProps->setPropertyValue( rNameSupplier.GetName( PROP_SURROUND ), uno::makeAny( m_nWrapMode ) ); } catch( const uno::Exception& e ) { - SAL_WARN("writerfilter", "Exception in OLE Handler: " << e.Message); + SAL_WARN("writerfilter", "Exception while setting wrap mode: " << e.Message); } } } |