diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-04 16:45:34 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-01-05 15:16:18 +0100 |
| commit | 3e146690d527d1c736685640e9f11172c7d087ba (patch) | |
| tree | 27b1210be19252ea01011432ca21f3655bb6ec89 /sw/source | |
| parent | 8d4d879eaadfdabf9ec00a223750dce20f95e158 (diff) | |
Resolves: fdo#43867 collection of problems causing loss of ole2 previews
a) factor out part of SvXMLEmbeddedObjectHelper::ImplGetStorageNames as
splitObjectURL to reuse in SvXMLGraphicHelper::ImplGetStreamNames to get better
url splitting logic to handle "./ObjectReplacements/foo"
b) FN_UNO_REPLACEMENT_GRAPHIC_URL and FN_UNO_GRAPHIC ids collide
urls incorrectly treated as graphics
c) imported preview images for objects set on a temporary
svt::EmbeddedObjectRef *copy* of the object, not the real object.
(cherry picked from commit ef17be8b006737c078a59635ae334a03301727ea)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Conflicts:
svx/source/xml/xmlgrhlp.cxx
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/unocore/unoframe.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 2091ac628f0f..141dabfbe537 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1211,10 +1211,10 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: if ( pOleNode ) { - svt::EmbeddedObjectRef xObj = pOleNode->GetOLEObj().GetObject(); + svt::EmbeddedObjectRef &rObj = pOleNode->GetOLEObj().GetObject(); ::rtl::OUString aMediaType; - xObj.SetGraphic( aGraphic, aMediaType ); + rObj.SetGraphic( aGraphic, aMediaType ); } } } |