summaryrefslogtreecommitdiff
path: root/sd/qa/unit/data
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-08-29 19:09:29 +0200
committerDavid Tardon <dtardon@redhat.com>2014-09-02 06:09:06 -0500
commit5ef1742e7d4b6852331bca4d65ee568980fb233c (patch)
tree1e0c8753c587e62fccd6cd3b02c57cb48141bfdb /sd/qa/unit/data
parent8718bcc3d74e5eed7499ec1359aff10659faaebc (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 'sd/qa/unit/data')
-rw-r--r--sd/qa/unit/data/odp/masterpage_style_parent.odpbin0 -> 17790 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/sd/qa/unit/data/odp/masterpage_style_parent.odp b/sd/qa/unit/data/odp/masterpage_style_parent.odp
new file mode 100644
index 000000000000..e9f63784905e
--- /dev/null
+++ b/sd/qa/unit/data/odp/masterpage_style_parent.odp
Binary files differ