diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-02-03 12:29:21 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-03-04 03:15:37 -0800 |
| commit | ec4afa74c0207bf538c5c4cd385724fc1c91252c (patch) | |
| tree | cdb993f4a69f36822dc46435cfc4275bdd9b4a14 /xmerge/Makefile | |
| parent | 4a13a27c3bc4931da743a7998466dfccd972b7cf (diff) | |
tdf#88811 SwXText::convertToTextFrame: handle shapes anchored to us
(cherry picked from commit 38f2b8b3b16aab19a2564ec699d253d3dccecc3c)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: Iedf8eacd37b8ed8e307a10e8ade32f53c7417c4a
Reviewed-on: https://gerrit.libreoffice.org/14629
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit c56abb3c952e3062099d32702719825ee55b5112)
Diffstat (limited to 'xmerge/Makefile')
0 files changed, 0 insertions, 0 deletions