diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2011-11-25 18:55:53 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2011-11-29 13:27:44 +0100 |
| commit | eca8fc7069d5e79d641151494e5d1c782066f1e2 (patch) | |
| tree | 69103b0186ecfd3b8009724f62466f53d1aaaaec | |
| parent | 1c58ec8e3d1f9fe282d66a5be6671cd674766ff6 (diff) | |
EMBEDDED_OBJECT UNO property now works, remove hack
| -rw-r--r-- | sw/source/core/unocore/unoframe.cxx | 5 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index c86c2a2acde5..2091ac628f0f 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -2287,7 +2287,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan pDoc->SetFlyName((SwFlyFrmFmt&)*pFmt2, sName); } } - else if( pStreamName && false ) + else if( pStreamName ) { ::rtl::OUString sStreamName; (*pStreamName) >>= sStreamName; @@ -2303,8 +2303,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan else if( pEmbeddedObject || pStreamName ) { uno::Reference< embed::XEmbeddedObject > obj; -// (*pEmbeddedObject) >>= obj; - (*pStreamName) >>= obj; + (*pEmbeddedObject) >>= obj; svt::EmbeddedObjectRef xObj; xObj.Assign( obj, embed::Aspects::MSOLE_CONTENT ); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 41749643f0a4..1ce2b5313c35 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1101,7 +1101,7 @@ void DomainMapper_Impl::appendStarMath( const Value& val ) uno::Reference< text::XTextContent > xStarMath( m_xTextFactory->createInstance(sEmbeddedService), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xStarMathProperties(xStarMath, uno::UNO_QUERY_THROW); - xStarMathProperties->setPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_STREAM_NAME ), + xStarMathProperties->setPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_EMBEDDED_OBJECT ), val.getAny()); uno::Reference< uno::XInterface > xInterface( formula->getComponent(), uno::UNO_QUERY ); |