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 /sw | |
parent | 1c58ec8e3d1f9fe282d66a5be6671cd674766ff6 (diff) |
EMBEDDED_OBJECT UNO property now works, remove hack
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/unocore/unoframe.cxx | 5 |
1 files changed, 2 insertions, 3 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 ); |