Skip to content

Commit 15614ba

Browse files
committed
This closes #1628, fix the GetPictures function returns pictures doesn't correct in some cases
1 parent db22452 commit 15614ba

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

picture.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -649,9 +649,7 @@ func (f *File) getPicture(row, col int, drawingXML, drawingRelationships string)
649649
if wsDr, _, err = f.drawingParser(drawingXML); err != nil {
650650
return
651651
}
652-
if pics = f.getPicturesFromWsDr(row, col, drawingRelationships, wsDr); len(pics) > 0 {
653-
return
654-
}
652+
pics = f.getPicturesFromWsDr(row, col, drawingRelationships, wsDr)
655653
deWsDr = new(decodeWsDr)
656654
if err = f.xmlNewDecoder(bytes.NewReader(namespaceStrictToTransitional(f.readXML(drawingXML)))).
657655
Decode(deWsDr); err != nil && err != io.EOF {

picture_test.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,15 @@ func TestAddPicture(t *testing.T) {
7070
assert.NoError(t, f.SaveAs(filepath.Join("test", "TestAddPicture1.xlsx")))
7171
assert.NoError(t, f.Close())
7272

73+
// Test get pictures after inserting a new picture from a workbook which contains existing pictures
74+
f, err = OpenFile(filepath.Join("test", "TestAddPicture1.xlsx"))
75+
assert.NoError(t, err)
76+
assert.NoError(t, f.AddPicture("Sheet1", "A30", filepath.Join("test", "images", "excel.jpg"), nil))
77+
pics, err := f.GetPictures("Sheet1", "A30")
78+
assert.NoError(t, err)
79+
assert.Len(t, pics, 2)
80+
assert.NoError(t, f.Close())
81+
7382
// Test add picture with unsupported charset content types
7483
f = NewFile()
7584
f.ContentTypes = nil

0 commit comments

Comments
 (0)