Skip to content

S
sdkjs
Commit 20d53876 authored by Alexander.Trofimov's avatar Alexander.Trofimov
Browse files
Options

move HatchPattern to common 

common/Drawings/HatchPattern to function-closure
parent 9a6dc6d7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 774 additions and 765 deletions
build/configs/webexcel.json
View file @ 20d53876
......@@ -64,6 +64,7 @@
"../common/CollaborativeEditingBase.js",
"../common/Controls.js",
"../common/Overlay.js",
"../common/Drawings/HatchPattern.js",
"../common/scroll.js",
"../cell/view/iscroll.js",
......@@ -71,7 +72,7 @@
"../common/wordcopypaste.js",
"../cell/apiDefines.js",
"../word/Drawing/HatchPattern.js",
"../word/Drawing/WorkEvents.js",
"../cell/document/empty-workbook.js",
"../cell/utils/utils.js",
......
build/configs/webpowerpoint.json
View file @ 20d53876
......@@ -64,6 +64,7 @@
"../common/CollaborativeEditingBase.js",
"../common/Controls.js",
"../common/Overlay.js",
"../common/Drawings/HatchPattern.js",
"../common/scroll.js",
......@@ -88,7 +89,6 @@
"../word/Editor/Common.js",
"../word/Editor/Sections.js",
"../word/Editor/History.js",
"../word/Drawing/HatchPattern.js",
"../word/Drawing/Graphics.js",
"../word/Drawing/ShapeDrawer.js",
"../slide/Drawing/Transitions.js",
......
build/configs/webword.json
View file @ 20d53876
......@@ -67,6 +67,7 @@
"../common/CollaborativeEditingBase.js",
"../common/Controls.js",
"../common/Overlay.js",
"../common/Drawings/HatchPattern.js",
"../common/scroll.js",
"../common/Scrolls/iscroll.js",
......@@ -112,7 +113,6 @@
"../word/Editor/FontClassification.js",
"../word/Editor/Spelling.js",
"../word/Drawing/Graphics.js",
"../word/Drawing/HatchPattern.js",
"../word/Drawing/ShapeDrawer.js",
"../word/Drawing/DrawingDocument.js",
"../word/Drawing/GraphicsEvents.js",
......
cell/model/DrawingObjects/ShapeDrawer.js
View file @ 20d53876
......@@ -1027,7 +1027,7 @@ CShapeDrawer.prototype =
var _ctx = (this.Graphics.IsTrack === true) ? this.Graphics.Graphics.m_oContext : this.Graphics.m_oContext;
var _patt_name = global_hatch_names[_fill.ftype];
var _patt_name = AscCommon.global_hatch_names[_fill.ftype];
if (undefined == _patt_name)
_patt_name = "cross";
......@@ -1037,7 +1037,7 @@ CShapeDrawer.prototype =
var __fa = (null === this.UniFill.transparent) ? _fc.A : 255;
var __ba = (null === this.UniFill.transparent) ? _bc.A : 255;
var _test_pattern = GetHatchBrush(_patt_name, _fc.R, _fc.G, _fc.B, __fa, _bc.R, _bc.G, _bc.B, __ba);
var _test_pattern = AscCommon.GetHatchBrush(_patt_name, _fc.R, _fc.G, _fc.B, __fa, _bc.R, _bc.G, _bc.B, __ba);
var patt = _ctx.createPattern(_test_pattern.Canvas, "repeat");
_ctx.save();
......@@ -1411,7 +1411,7 @@ CShapeDrawer.prototype =
var _fill = this.UniFill.fill;
if (_fill.type == c_oAscFill.FILL_TYPE_PATT)
{
var _patt_name = global_hatch_names[_fill.ftype];
var _patt_name = AscCommon.global_hatch_names[_fill.ftype];
if (undefined == _patt_name)
_patt_name = "cross";
......@@ -1421,7 +1421,7 @@ CShapeDrawer.prototype =
var __fa = (null === this.UniFill.transparent) ? _fc.A : 255;
var __ba = (null === this.UniFill.transparent) ? _bc.A : 255;
var _pattern = GetHatchBrush(_patt_name, _fc.R, _fc.G, _fc.B, __fa, _bc.R, _bc.G, _bc.B, __ba);
var _pattern = AscCommon.GetHatchBrush(_patt_name, _fc.R, _fc.G, _fc.B, __fa, _bc.R, _bc.G, _bc.B, __ba);
var _url64 = "";
try
......
common/Native/Wrappers/ShapeDrawer.js
View file @ 20d53876
......@@ -930,7 +930,7 @@ CShapeDrawer.prototype =
}
case Asc.c_oAscFill.FILL_TYPE_PATT:
{
var _patt_name = global_hatch_names[_fill.ftype];
var _patt_name = AscCommon.global_hatch_names[_fill.ftype];
if (undefined == _patt_name)
_patt_name = "cross";
......@@ -1190,7 +1190,7 @@ CShapeDrawer.prototype =
var _fill = this.UniFill.fill;
if (_fill.type == Asc.c_oAscFill.FILL_TYPE_PATT)
{
var _patt_name = global_hatch_names[_fill.ftype];
var _patt_name = AscCommon.global_hatch_names[_fill.ftype];
if (undefined == _patt_name)
_patt_name = "cross";
......@@ -1200,7 +1200,7 @@ CShapeDrawer.prototype =
var __fa = (null === this.UniFill.transparent) ? _fc.A : 255;
var __ba = (null === this.UniFill.transparent) ? _bc.A : 255;
var _pattern = GetHatchBrush(_patt_name, _fc.R, _fc.G, _fc.B, __fa, _bc.R, _bc.G, _bc.B, __ba);
var _pattern = AscCommon.GetHatchBrush(_patt_name, _fc.R, _fc.G, _fc.B, __fa, _bc.R, _bc.G, _bc.B, __ba);
var _url64 = "";
try
......
word/Drawing/ShapeDrawer.js
View file @ 20d53876
......@@ -1000,7 +1000,7 @@ CShapeDrawer.prototype =
var _ctx = (this.Graphics.IsTrack === true) ? this.Graphics.Graphics.m_oContext : this.Graphics.m_oContext;
var _patt_name = global_hatch_names[_fill.ftype];
var _patt_name = AscCommon.global_hatch_names[_fill.ftype];
if (undefined == _patt_name)
_patt_name = "cross";
......@@ -1010,7 +1010,7 @@ CShapeDrawer.prototype =
var __fa = (null === this.UniFill.transparent) ? _fc.A : 255;
var __ba = (null === this.UniFill.transparent) ? _bc.A : 255;
var _test_pattern = GetHatchBrush(_patt_name, _fc.R, _fc.G, _fc.B, __fa, _bc.R, _bc.G, _bc.B, __ba);
var _test_pattern = AscCommon.GetHatchBrush(_patt_name, _fc.R, _fc.G, _fc.B, __fa, _bc.R, _bc.G, _bc.B, __ba);
var patt = _ctx.createPattern(_test_pattern.Canvas, "repeat");
_ctx.save();
......@@ -1396,7 +1396,7 @@ CShapeDrawer.prototype =
var _fill = this.UniFill.fill;
if (_fill.type == c_oAscFill.FILL_TYPE_PATT)
{
var _patt_name = global_hatch_names[_fill.ftype];
var _patt_name = AscCommon.global_hatch_names[_fill.ftype];
if (undefined == _patt_name)
_patt_name = "cross";
......@@ -1406,7 +1406,7 @@ CShapeDrawer.prototype =
var __fa = (null === this.UniFill.transparent) ? _fc.A : 255;
var __ba = (null === this.UniFill.transparent) ? _bc.A : 255;
var _pattern = GetHatchBrush(_patt_name, _fc.R, _fc.G, _fc.B, __fa, _bc.R, _bc.G, _bc.B, __ba);
var _pattern = AscCommon.GetHatchBrush(_patt_name, _fc.R, _fc.G, _fc.B, __fa, _bc.R, _bc.G, _bc.B, __ba);
var _url64 = "";
try
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7