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 /xmloff | |
parent | startcenter: Add missing tooltip for new presentation button (diff) | |
download | core-b69d152cfa1da868ba960345d72ba78f9f8e1b35.tar.gz core-b69d152cfa1da868ba960345d72ba78f9f8e1b35.zip |
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 'xmloff')
-rw-r--r-- | xmloff/source/core/xmlmultiimagehelper.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 5 | ||||
-rw-r--r-- | xmloff/source/text/XMLTextFrameContext.cxx | 30 |
3 files changed, 33 insertions, 6 deletions
diff --git a/xmloff/source/core/xmlmultiimagehelper.cxx b/xmloff/source/core/xmlmultiimagehelper.cxx index 998b773e5d4d..5445b6f8f199 100644 --- a/xmloff/source/core/xmlmultiimagehelper.cxx +++ b/xmloff/source/core/xmlmultiimagehelper.cxx @@ -83,9 +83,9 @@ MultiImageImportHelper::~MultiImageImportHelper() } } -const SvXMLImportContext* MultiImageImportHelper::solveMultipleImages() +SvXMLImportContextRef MultiImageImportHelper::solveMultipleImages() { - const SvXMLImportContext* pContext(0); + SvXMLImportContextRef pContext; if(maImplContextVector.size() > 1) { // multiple child contexts were imported, decide which is the most valuable one diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index b1a00c3a716f..ed9def807223 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -3426,8 +3426,9 @@ void SdXMLFrameShapeContext::StartElement(const uno::Reference< xml::sax::XAttri void SdXMLFrameShapeContext::EndElement() { // solve if multiple image child contexts were imported - const SvXMLImportContext* const pSelectedContext(solveMultipleImages()); - const SdXMLGraphicObjectShapeContext* pShapeContext( dynamic_cast<const SdXMLGraphicObjectShapeContext*>( pSelectedContext ) ); + SvXMLImportContextRef const pSelectedContext(solveMultipleImages()); + const SdXMLGraphicObjectShapeContext* pShapeContext( + dynamic_cast<const SdXMLGraphicObjectShapeContext*>(&pSelectedContext)); if ( pShapeContext && !maShapeId.isEmpty() ) { // fdo#64512 and fdo#60075 - make sure *this* shape is diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index 4888f07881c1..7a0ca85574a7 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -364,6 +364,7 @@ class XMLTextFrameContext_Impl : public SvXMLImportContext const OUString sTextBoxServiceName; const OUString sGraphicServiceName; + OUString m_sOrigName; OUString sName; OUString sStyleName; OUString sNextName; @@ -441,6 +442,8 @@ public: void SetDesc( const OUString& rDesc ); + void SetName(); + ::com::sun::star::text::TextContentAnchorType GetAnchorType() const { return eAnchorType; } const ::com::sun::star::uno::Reference < @@ -893,6 +896,7 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl( sStyleName = rValue; break; case XML_TOK_TEXT_FRAME_NAME: + m_sOrigName = rValue; sName = rValue; break; case XML_TOK_TEXT_FRAME_FRAME_NAME: @@ -1276,6 +1280,19 @@ void XMLTextFrameContext_Impl::SetHyperlink( const OUString& rHRef, } } +void XMLTextFrameContext_Impl::SetName() +{ + Reference<XNamed> xNamed(xPropSet, UNO_QUERY); + if (xNamed.is()) + { + OUString const name(xNamed->getName()); + if (name != m_sOrigName) + { + xNamed->setName(m_sOrigName); + } + } +} + // Implement Title/Description Elements UI (#i73249#) void XMLTextFrameContext_Impl::SetTitle( const OUString& rTitle ) { @@ -1383,14 +1400,23 @@ XMLTextFrameContext::~XMLTextFrameContext() void XMLTextFrameContext::EndElement() { /// solve if multiple image child contexts were imported - solveMultipleImages(); + SvXMLImportContextRef const pMultiContext(solveMultipleImages()); - SvXMLImportContext *pContext = &m_xImplContext; + SvXMLImportContext const*const pContext = + (pMultiContext) ? &pMultiContext : &m_xImplContext; XMLTextFrameContext_Impl *pImpl = PTR_CAST( XMLTextFrameContext_Impl, pContext ); + assert(!pMultiContext || pImpl); if( pImpl ) { pImpl->CreateIfNotThere(); + // fdo#68839: in case the surviving image was not the first one, + // it will have a counter added to its name - set the original name + if (pMultiContext) // do this only when necessary; esp. not for text + { // frames that may have entries in GetRenameMap()! + pImpl->SetName(); + } + if( !m_sTitle.isEmpty() ) { pImpl->SetTitle( m_sTitle ); |