From c1d65f3c7ed37a96ba5bdbe31453f318fce734a3 Mon Sep 17 00:00:00 2001 From: Sergey Vladimirov Date: Fri, 30 Sep 2011 15:49:45 +0000 Subject: [PATCH] picture loading completely rewritten, bugs 51902 and 51890 fixed git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1177710 13f79535-47bb-0310-9956-ffa450edef68 --- test-data/document/Bug51890.doc | Bin 0 -> 44544 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test-data/document/Bug51890.doc diff --git a/test-data/document/Bug51890.doc b/test-data/document/Bug51890.doc new file mode 100644 index 0000000000000000000000000000000000000000..82701bdd24b3423b13731a702ccedff1b0fd7f05 GIT binary patch literal 44544 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 odX>