diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2014-05-19 11:37:11 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-05-23 20:38:13 +0100 |
| commit | 192abfb36b8a4859879fcb49326d59ed62083c8d (patch) | |
| tree | 2381f9d2d8b66750bbca679f41e778e9a916260f /.gitattributes | |
| parent | e0eb5fa849c5680031f809a1440a35cbd6b58e93 (diff) | |
Resolves: #i114361# provide and accept changed URL...
of embedded graphic file during save (ODF export)
(cherry picked from commit a90c007908eb3f66e28a9ea525729065db652b6f)
Conflicts:
sw/inc/ndgrf.hxx
sw/source/core/graphic/ndgrf.cxx
sw/source/core/unocore/unoframe.cxx
sw/source/filter/xml/xmltexte.cxx
xmloff/source/draw/shapeexport2.cxx
Change-Id: I9d4a02af2561467fe1a66f036b55d6dcf2429986
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions