diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-08-29 19:09:29 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2014-09-02 06:09:06 -0500 |
commit | 5ef1742e7d4b6852331bca4d65ee568980fb233c (patch) | |
tree | 1e0c8753c587e62fccd6cd3b02c57cb48141bfdb /shell/Library_shlxthdl_x64.mk | |
parent | 8718bcc3d74e5eed7499ec1359aff10659faaebc (diff) |
n#708518: sd: check that master page matches when setting parent style
In ODF import it happened that the parent style of "outline2" etc.
was always set to the "outline1" style of the first master page in
the document, but it should be the "outline1" style of the same master
page as the "outline2".
(regression from e955433c3574cb602dedba96bc645898f97858bf)
(cherry picked from commit 5b63c12ace2aec9a659e4b9125f6aa9ff204ed09)
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: Ie563d5ee5c2040aeb6ca5c8bb25b195e15ea964e
Reviewed-on: https://gerrit.libreoffice.org/11195
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'shell/Library_shlxthdl_x64.mk')
0 files changed, 0 insertions, 0 deletions