diff options
| author | Armin Le Grand <alg@apache.org> | 2014-02-04 17:42:05 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-05 11:36:35 +0000 |
| commit | 258e6f93e81539d90b23f45224dd225a6e20ab0d (patch) | |
| tree | 991aeed972476fe1fe4d2eb885fe882610d185d6 /xmloff/source/draw/ximpshap.hxx | |
| parent | 461550cdb5b86fd3b20e6f381acb14bcccf91406 (diff) | |
Resolves: #i124143# for draw:frame containing multiple draw:image...
and draw:glue-point it is necessary to move the GluePoints from the last
draw:image where they were automatically imported to the surviving one if these
are different
(cherry picked from commit c011af1087411a9bacd29cd479c807e698b2e92c)
Conflicts:
xmloff/inc/xmloff/xmlictxt.hxx
xmloff/source/core/xmlmultiimagehelper.cxx
xmloff/source/draw/ximpshap.cxx
xmloff/source/draw/ximpshap.hxx
Change-Id: I8f6c875767e9cbfee74838742401356df002b051
Diffstat (limited to 'xmloff/source/draw/ximpshap.hxx')
| -rw-r--r-- | xmloff/source/draw/ximpshap.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index b07a20717a59..a4b8786840b8 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -115,6 +115,10 @@ public: // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); + + // allow to copy evtl. useful data from another temporary import context, e.g. used to + // support multiple images + virtual void onDemandRescueUsefulDataFromTemporary( const SvXMLImportContext& rCandidate ); }; // draw:rect context |