Fix Presentation.with_data? for shape with preset geometry (#574)

Fix #537
ONLYOFFICE · Apr 11, 2019 · 0845231 · 0845231
1 parent 93b8219
commit 0845231
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -80,6 +80,7 @@
 * Values of `DocxShapeSize#flip_horizontal` and 
 `DocxShapeSize#flip_vertical` are Boolean
 * Fix crash on gradient stop with unknown SchemeColor ([ooxml_parser#571](https://github.com/ONLYOFFICE/ooxml_parser/issues/571))
+* Fix `Presentation.with_data?` for shape with preset geometry ([ooxml_parser#573](https://github.com/ONLYOFFICE/ooxml_parser/issues/573))
 
 ## 0.4.1 (2018-03-01)
 ### Fixes

diff --git a/...ml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape.rb b/...ml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape.rb
@@ -15,6 +15,7 @@ def with_data?
       return true if @text_body.nil?
       return true if @text_body.paragraphs.length > 1
       return true unless @text_body.paragraphs.first.runs.empty?
+      return true if properties.preset_geometry
 
       false
     end

diff --git a/spec/presentation/with_data/shape_with_preset_geometry.pptx b/spec/presentation/with_data/shape_with_preset_geometry.pptx
diff --git a/spec/presentation/with_data_spec.rb b/spec/presentation/with_data_spec.rb
@@ -41,4 +41,9 @@
     pptx.with_data?
     expect(pptx).to be_with_data
   end
+
+  it 'shape_with_preset_geometry' do
+    pptx = OoxmlParser::Parser.parse('spec/presentation/with_data/shape_with_preset_geometry.pptx')
+    expect(pptx).to be_with_data
+  end
 end