diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-04 16:45:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-05 09:18:21 +0000 |
| commit | ef17be8b006737c078a59635ae334a03301727ea (patch) | |
| tree | be3d9cfbee5e1b5d1b78297734c6c80c6b25b507 /sw | |
| parent | a37484060c63138e869937ca518c723b36c1893d (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.
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/cmdid.h | 6 | ||||
| -rw-r--r-- | sw/source/core/unocore/unoframe.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 33c287bec513..7802db719670 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -842,10 +842,10 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_UNO_COMPONENT (FN_EXTRA2 + 97) #define FN_WORDCOUNT_DIALOG (FN_EXTRA2 + 98) -#define FN_XFORMS_DESIGN_MODE (FN_EXTRA2 + 100) +#define FN_XFORMS_DESIGN_MODE (FN_EXTRA2 + 99) -#define FN_UNO_PARA_STYLE_CONDITIONS (FN_EXTRA2 + 101) -#define FN_UNO_GRAPHIC (FN_EXTRA2 + 102) +#define FN_UNO_PARA_STYLE_CONDITIONS (FN_EXTRA2 + 100) +#define FN_UNO_GRAPHIC (FN_EXTRA2 + 101) #define FN_UNO_REPLACEMENT_GRAPHIC_URL (FN_EXTRA2 + 102) #define FN_UNO_CELL_ROW_SPAN (FN_EXTRA2 + 103) 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 ); } } } |