fix Bug 34989

3f1cafd7 · SergeyLuzyanin · f76bb183 · 3f1cafd7 · 3f1cafd7
Commit 3f1cafd7 authored May 23, 2017 by SergeyLuzyanin
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

common/Shapes/Serialize.js common/Shapes/Serialize.js +4 -1

common/Shapes/SerializeWriter.js common/Shapes/SerializeWriter.js +4 -2

No files found.
--- a/common/Shapes/Serialize.js
+++ b/common/Shapes/Serialize.js
@@ -2398,7 +2398,10 @@ function BinaryPPTYLoader()
                    }
                    else
                    {
-                        uni_fill.fill.color.setMods(new AscFormat.CColorModifiers());
+                        if(uni_fill.fill.color){
+                            uni_fill.fill.color.setMods(new AscFormat.CColorModifiers());
+                        }
                    }
                    break;
                }

--- a/common/Shapes/SerializeWriter.js
+++ b/common/Shapes/SerializeWriter.js
@@ -2474,8 +2474,10 @@ function CBinaryFileWriter()
            {
                oThis.StartRecord(c_oAscFill.FILL_TYPE_SOLID);
-                oThis.CorrectUniColorAlpha(fill.color, trans);
+                if(fill.color){
-                oThis.WriteRecord1(0, fill.color, oThis.WriteUniColor);
+                    oThis.CorrectUniColorAlpha(fill.color, trans);
+                    oThis.WriteRecord1(0, fill.color, oThis.WriteUniColor);
+                }
                oThis.EndRecord();
                break;
            }