| commit | 1ddfd1df97607a2fa1281cb51c42044dc668761f | |
| author | Caolán McNamara <caolanm@redhat.com> | |
| Wed, 15 Apr 2015 11:48:47 +0000 (15 12:48 +0100) | ||
| committer | Andras Timar <andras.timar@collabora.com> | |
| Thu, 16 Apr 2015 10:58:22 +0000 (16 12:58 +0200) | ||
| tree | 6c2d292b6bed34c1468342ccf80f0cbb95d450dd | treesnapshot (tar.gz zip) |
| parent | ce58792b4fa57eb280040eaca80560d1471aefa2 | commitdiff |
fix crash on re-export of fdo50057-2.odt to odt
(cherry picked from commit 66c9aec156d974b939b680dccbb27e18fb153a23)
Conflicts:
sfx2/source/appl/fileobj.hxx
Change-Id: Ice7a754dd4f42b5cf62ae2038b63d893b8a92fd8
Reviewed-on: https://gerrit.libreoffice.org/15326
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 66c9aec156d974b939b680dccbb27e18fb153a23)
Conflicts:
sfx2/source/appl/fileobj.hxx
Change-Id: Ice7a754dd4f42b5cf62ae2038b63d893b8a92fd8
Reviewed-on: https://gerrit.libreoffice.org/15326
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
| sfx2/source/appl/fileobj.cxx | diffblobblamehistory | |
| sfx2/source/appl/fileobj.hxx | diffblobblamehistory |