diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-03 00:32:08 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-03 00:54:14 +0200 |
| commit | b69d152cfa1da868ba960345d72ba78f9f8e1b35 (patch) | |
| tree | 55c19e774edae4292e22e1bea5baa7130b4b1b53 /include/xmloff | |
| parent | 963d09826711f4eec6c9ba0750ffc01b478f7298 (diff) | |
fdo#68839: ODF import: fix name of multi-image frame
When multiple image child elements are inside a frame, each one is
imported and gets unique name via SwDoc::SetFlyName(). But the
retained one is not necessarily the first one, which is the only one
that may have the original name.
Also the solveMultipleImages needs to return a smart pointer, as nothing
else keeps the image contexts alive.
(regression from 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70)
Change-Id: I28a8a752f3eed176cc2ebb4c9af11a0dd4d18ea6
Diffstat (limited to 'include/xmloff')
| -rw-r--r-- | include/xmloff/xmlmultiimagehelper.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/xmloff/xmlmultiimagehelper.hxx b/include/xmloff/xmlmultiimagehelper.hxx index 7a7e2ab41d19..050eff76337b 100644 --- a/include/xmloff/xmlmultiimagehelper.hxx +++ b/include/xmloff/xmlmultiimagehelper.hxx @@ -44,7 +44,7 @@ public: /// see imlementation for evtl. changing weights and/or adding filetypes. /// /// @returns import context of the selected image - const SvXMLImportContext* solveMultipleImages(); + SvXMLImportContextRef solveMultipleImages(); /// add a content to the remembered image import contexts void addContent(const SvXMLImportContext& rSvXMLImportContext); |