summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-08-20 12:56:36 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-08-21 11:36:05 +0200
commit3c230d608b766e573eeca66e203114b262478230 (patch)
tree8b750d82df7a5517d4f16486510c6dd6b1f9bf03 /sd
parent13ae66c0eb0ab03ac4a43c52dd2359fbaa7f5867 (diff)
rhbz#1870501 crash on reexport of odg
where SdrObjects in a list have no navigation position set a regression from 450cd772aa734cfcb989c8cedd3c0a454db74a34 Fix fdo#64512 Handle xml:id correctly on multi-image draw:frames this just reverts that and adds the test case that crashed Change-Id: I1a49dab9578699c42fe845e8ec42de40159dec3d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101074 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/qa/unit/data/odg/rhbz1870501.odgbin0 -> 403275 bytes
-rw-r--r--sd/qa/unit/export-tests.cxx9
2 files changed, 9 insertions, 0 deletions
diff --git a/sd/qa/unit/data/odg/rhbz1870501.odg b/sd/qa/unit/data/odg/rhbz1870501.odg
new file mode 100644
index 000000000000..cc4bcef193c2
--- /dev/null
+++ b/sd/qa/unit/data/odg/rhbz1870501.odg
Binary files differ
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index eb97da60fd1f..1acda7b2712f 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -81,6 +81,7 @@ public:
void testSoftEdges();
void testShadowBlur();
void testTdf115753();
+ void testRhbz1870501();
CPPUNIT_TEST_SUITE(SdExportTest);
@@ -119,6 +120,7 @@ public:
CPPUNIT_TEST(testSoftEdges);
CPPUNIT_TEST(testShadowBlur);
CPPUNIT_TEST(testTdf115753);
+ CPPUNIT_TEST(testRhbz1870501);
CPPUNIT_TEST_SUITE_END();
@@ -1377,6 +1379,13 @@ void SdExportTest::testShadowBlur()
xDocShRef->DoClose();
}
+void SdExportTest::testRhbz1870501()
+{
+ //Without the fix in place, it would crash at export time
+ ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/odg/rhbz1870501.odg"), ODG);
+ xDocShRef = saveAndReload( xDocShRef.get(), ODG );
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();