Commit d6de2669 authored by konovalovsergey's avatar konovalovsergey Committed by Alexander.Trofimov

grpFill open/save

parent 01d2d99c
...@@ -1191,6 +1191,7 @@ window['AscDFH'].historyitem_type_SlideComments = 1119; ...@@ -1191,6 +1191,7 @@ window['AscDFH'].historyitem_type_SlideComments = 1119;
window['AscDFH'].historyitem_type_PropLocker = 1120; window['AscDFH'].historyitem_type_PropLocker = 1120;
window['AscDFH'].historyitem_type_Theme = 1121; window['AscDFH'].historyitem_type_Theme = 1121;
window['AscDFH'].historyitem_type_GraphicFrame = 1122; window['AscDFH'].historyitem_type_GraphicFrame = 1122;
window['AscDFH'].historyitem_type_GrpFill = 1123;
......
...@@ -2991,6 +2991,87 @@ CNoFill.prototype = ...@@ -2991,6 +2991,87 @@ CNoFill.prototype =
} }
}; };
function CGrpFill()
{
this.type = c_oAscFill.FILL_TYPE_GRP;
}
CGrpFill.prototype =
{
Get_Id: function()
{
return this.Id;
},
Refresh_RecalcData: function()
{},
check: function()
{},
getObjectType: function()
{
return AscDFH.historyitem_type_GrpFill;
},
Write_ToBinary: function(w)
{
w.WriteLong(c_oAscFill.FILL_TYPE_GRP);
},
Read_FromBinary: function(r)
{
},
checkWordMods: function()
{
return false;
},
convertToPPTXMods: function()
{
},
canConvertPPTXModsToWord: function()
{
return false;
},
convertToWordMods: function()
{
},
createDuplicate : function()
{
return new CGrpFill();
},
IsIdentical : function(fill)
{
if(fill == null)
{
return false;
}
return fill.type === c_oAscFill.FILL_TYPE_GRP;
},
compare : function(grpfill)
{
if(grpfill == null)
{
return null;
}
if(grpfill.type === this.type)
{
return new CGrpFill();
}
return null;
}
};
function CreateBlackRGBUnifill() function CreateBlackRGBUnifill()
{ {
...@@ -3043,6 +3124,7 @@ CUniFill.prototype = ...@@ -3043,6 +3124,7 @@ CUniFill.prototype =
case c_oAscFill.FILL_TYPE_NONE: case c_oAscFill.FILL_TYPE_NONE:
case c_oAscFill.FILL_TYPE_BLIP: case c_oAscFill.FILL_TYPE_BLIP:
case c_oAscFill.FILL_TYPE_NOFILL: case c_oAscFill.FILL_TYPE_NOFILL:
case c_oAscFill.FILL_TYPE_GRP:
{ {
break; break;
} }
...@@ -3090,6 +3172,7 @@ CUniFill.prototype = ...@@ -3090,6 +3172,7 @@ CUniFill.prototype =
case c_oAscFill.FILL_TYPE_NONE: case c_oAscFill.FILL_TYPE_NONE:
case c_oAscFill.FILL_TYPE_BLIP: case c_oAscFill.FILL_TYPE_BLIP:
case c_oAscFill.FILL_TYPE_NOFILL: case c_oAscFill.FILL_TYPE_NOFILL:
case c_oAscFill.FILL_TYPE_GRP:
{ {
break; break;
} }
...@@ -3220,6 +3303,12 @@ CUniFill.prototype = ...@@ -3220,6 +3303,12 @@ CUniFill.prototype =
this.fill.Read_FromBinary(r); this.fill.Read_FromBinary(r);
break; break;
} }
case c_oAscFill.FILL_TYPE_GRP:
{
this.fill = new CGrpFill();
this.fill.Read_FromBinary(r);
break;
}
} }
} }
}, },
...@@ -11153,6 +11242,11 @@ function CreateAscFill(unifill) ...@@ -11153,6 +11242,11 @@ function CreateAscFill(unifill)
ret.type = c_oAscFill.FILL_TYPE_NOFILL; ret.type = c_oAscFill.FILL_TYPE_NOFILL;
break; break;
} }
case c_oAscFill.FILL_TYPE_GRP:
{
ret.type = c_oAscFill.FILL_TYPE_GRP;
break;
}
default: default:
break; break;
} }
...@@ -11184,6 +11278,11 @@ function CorrectUniFill(asc_fill, unifill, editorId) ...@@ -11184,6 +11278,11 @@ function CorrectUniFill(asc_fill, unifill, editorId)
ret.fill = new CNoFill(); ret.fill = new CNoFill();
break; break;
} }
case c_oAscFill.FILL_TYPE_GRP:
{
ret.fill = new CGrpFill();
break;
}
case c_oAscFill.FILL_TYPE_BLIP: case c_oAscFill.FILL_TYPE_BLIP:
{ {
...@@ -11809,6 +11908,7 @@ function CorrectUniColor(asc_color, unicolor, flag) ...@@ -11809,6 +11908,7 @@ function CorrectUniColor(asc_color, unicolor, flag)
window['AscFormat'].CGradFill = CGradFill; window['AscFormat'].CGradFill = CGradFill;
window['AscFormat'].CPattFill = CPattFill; window['AscFormat'].CPattFill = CPattFill;
window['AscFormat'].CNoFill = CNoFill; window['AscFormat'].CNoFill = CNoFill;
window['AscFormat'].CGrpFill = CGrpFill;
window['AscFormat'].CUniFill = CUniFill; window['AscFormat'].CUniFill = CUniFill;
window['AscFormat'].CompareUniFill = CompareUniFill; window['AscFormat'].CompareUniFill = CompareUniFill;
window['AscFormat'].CompareUnifillBool = CompareUnifillBool; window['AscFormat'].CompareUnifillBool = CompareUnifillBool;
......
...@@ -2512,6 +2512,11 @@ function BinaryPPTYLoader() ...@@ -2512,6 +2512,11 @@ function BinaryPPTYLoader()
uni_fill.setFill(new AscFormat.CNoFill()); uni_fill.setFill(new AscFormat.CNoFill());
break; break;
} }
case c_oAscFill.FILL_TYPE_GRP:
{
uni_fill.setFill(new AscFormat.CGrpFill());
break;
}
} }
} }
......
...@@ -2191,6 +2191,12 @@ function CBinaryFileWriter() ...@@ -2191,6 +2191,12 @@ function CBinaryFileWriter()
oThis.EndRecord(); oThis.EndRecord();
break; break;
} }
case c_oAscFill.FILL_TYPE_GRP:
{
oThis.StartRecord(c_oAscFill.FILL_TYPE_GRP);
oThis.EndRecord();
break;
}
case c_oAscFill.FILL_TYPE_GRAD: case c_oAscFill.FILL_TYPE_GRAD:
{ {
oThis.StartRecord(c_oAscFill.FILL_TYPE_GRAD); oThis.StartRecord(c_oAscFill.FILL_TYPE_GRAD);
......
...@@ -616,8 +616,8 @@ var c_oAscFill = { ...@@ -616,8 +616,8 @@ var c_oAscFill = {
FILL_TYPE_NOFILL : 2, FILL_TYPE_NOFILL : 2,
FILL_TYPE_SOLID : 3, FILL_TYPE_SOLID : 3,
FILL_TYPE_GRAD : 4, FILL_TYPE_GRAD : 4,
FILL_TYPE_PATT : 5 FILL_TYPE_PATT : 5,
FILL_TYPE_GRP : 6
}; };
// Chart defines // Chart defines
...@@ -1266,6 +1266,7 @@ window['Asc']['c_oAscFill'] = window['Asc'].c_oAscFill = c_oAscFill; ...@@ -1266,6 +1266,7 @@ window['Asc']['c_oAscFill'] = window['Asc'].c_oAscFill = c_oAscFill;
prot['FILL_TYPE_SOLID'] = prot.FILL_TYPE_SOLID; prot['FILL_TYPE_SOLID'] = prot.FILL_TYPE_SOLID;
prot['FILL_TYPE_GRAD'] = prot.FILL_TYPE_GRAD; prot['FILL_TYPE_GRAD'] = prot.FILL_TYPE_GRAD;
prot['FILL_TYPE_PATT'] = prot.FILL_TYPE_PATT; prot['FILL_TYPE_PATT'] = prot.FILL_TYPE_PATT;
prot['FILL_TYPE_GRP'] = prot.FILL_TYPE_GRP;
window['Asc']['c_oAscFillGradType'] = window['Asc'].c_oAscFillGradType = c_oAscFillGradType; window['Asc']['c_oAscFillGradType'] = window['Asc'].c_oAscFillGradType = c_oAscFillGradType;
prot = c_oAscFillGradType; prot = c_oAscFillGradType;
prot['GRAD_LINEAR'] = prot.GRAD_LINEAR; prot['GRAD_LINEAR'] = prot.GRAD_LINEAR;
......
...@@ -516,7 +516,7 @@ function CPPTXContentLoader() ...@@ -516,7 +516,7 @@ function CPPTXContentLoader()
case 1: case 1:
{ {
var spPr = new AscFormat.CSpPr(); var spPr = new AscFormat.CSpPr();
this.ReadSpPr(spPr); this.Reader.ReadGrSpPr(spPr);
shape.setSpPr(spPr); shape.setSpPr(spPr);
shape.spPr.setParent(shape); shape.spPr.setParent(shape);
break; break;
......
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