Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
sdkjs
Commits
92450ded
Commit
92450ded
authored
Nov 18, 2016
by
Oleg Korshul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ClearLastFont in graphics (for use global fontmanagers outside graphics)
parent
57146166
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
0 deletions
+20
-0
cell/model/DrawingObjects/Graphics.js
cell/model/DrawingObjects/Graphics.js
+6
-0
common/Charts/charts.js
common/Charts/charts.js
+8
-0
word/Drawing/Graphics.js
word/Drawing/Graphics.js
+6
-0
No files found.
cell/model/DrawingObjects/Graphics.js
View file @
92450ded
...
...
@@ -479,6 +479,12 @@ CGraphics.prototype =
this
.
m_oFontManager
.
m_pFont
=
null
;
},
ClearLastFont
:
function
()
{
this
.
m_oLastFont
=
new
AscCommon
.
CFontSetup
();
this
.
m_oLastFont2
=
null
;
},
// images
drawImage2
:
function
(
img
,
x
,
y
,
w
,
h
,
alpha
,
srcRect
)
{
...
...
common/Charts/charts.js
View file @
92450ded
...
...
@@ -479,6 +479,14 @@ ChartPreviewManager.prototype.getChartPreviews = function(chartType) {
for
(
var
i
=
0
;
i
<
nStylesCount
;
++
i
)
arr
.
push
(
this
.
createChartPreview
(
chartType
,
i
));
}
if
(
Asc
[
'
editor
'
]
&&
AscCommon
.
c_oEditorId
.
Spreadsheet
===
Asc
[
'
editor
'
].
getEditorId
())
{
var
api_sheet
=
Asc
[
'
editor
'
];
var
_graphics
=
api_sheet
.
wb
.
getWorksheet
().
shapeCtx
;
if
(
_graphics
.
ClearLastFont
)
_graphics
.
ClearLastFont
();
}
}
var
group
=
this
.
previewGroups
[
chartType
];
var
objectGroup
=
[];
...
...
word/Drawing/Graphics.js
View file @
92450ded
...
...
@@ -480,6 +480,12 @@ CGraphics.prototype =
this
.
m_oFontManager
.
m_pFont
=
null
;
},
ClearLastFont
:
function
()
{
this
.
m_oLastFont
=
new
AscCommon
.
CFontSetup
();
this
.
m_oLastFont2
=
null
;
},
// images
drawImage2
:
function
(
img
,
x
,
y
,
w
,
h
,
alpha
,
srcRect
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment