Kaydet (Commit) 005be0cd authored tarafından Samuel Mehrbrodt's avatar Samuel Mehrbrodt Kaydeden (comit) Michael Stahl

tdf#118502 Fix loading of eps images with replacement graphic

Change-Id: Iaf9c8e2ed72115e1f82d2541ae2a1d4803795a46
Reviewed-on: https://gerrit.libreoffice.org/60752
Tested-by: Jenkins
Reviewed-by: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 088af440)
Reviewed-on: https://gerrit.libreoffice.org/60768Reviewed-by: 's avatarMichael Stahl <Michael.Stahl@cib.de>
üst 4a63deae
...@@ -1770,6 +1770,14 @@ DECLARE_ODFEXPORT_TEST(testTdf77961, "tdf77961.odt") ...@@ -1770,6 +1770,14 @@ DECLARE_ODFEXPORT_TEST(testTdf77961, "tdf77961.odt")
CPPUNIT_ASSERT_EQUAL( false , getProperty<bool>(xStyle, "GridPrint")); CPPUNIT_ASSERT_EQUAL( false , getProperty<bool>(xStyle, "GridPrint"));
} }
DECLARE_ODFEXPORT_TEST(tdf118502, "tdf118502.odt")
{
uno::Reference<drawing::XShape> xShape = getShape(1);
// Make sure the replacement graphic is still there
// (was gone because the original graphic was not recognized during load)
CPPUNIT_ASSERT(!getProperty<OUString>(xShape, "ReplacementGraphicURL").isEmpty());
}
#endif #endif
CPPUNIT_PLUGIN_IMPLEMENT(); CPPUNIT_PLUGIN_IMPLEMENT();
......
...@@ -75,6 +75,10 @@ namespace ...@@ -75,6 +75,10 @@ namespace
{ {
return 1020; return 1020;
} }
if(sMimeType == "image/x-eps")
{
return 1025;
}
if(sMimeType == "application/pdf") if(sMimeType == "application/pdf")
{ {
return 1030; return 1030;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment