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
3e693f1b
Commit
3e693f1b
authored
Mar 26, 2017
by
Sergey Luzyanin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 34558
parent
5766898f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
125 additions
and
114 deletions
+125
-114
common/Drawings/Format/ChartFormat.js
common/Drawings/Format/ChartFormat.js
+9
-0
common/Drawings/Format/Shape.js
common/Drawings/Format/Shape.js
+116
-114
No files found.
common/Drawings/Format/ChartFormat.js
View file @
3e693f1b
...
@@ -1063,6 +1063,10 @@ CDLbl.prototype =
...
@@ -1063,6 +1063,10 @@ CDLbl.prototype =
return
AscDFH
.
historyitem_type_DLbl
;
return
AscDFH
.
historyitem_type_DLbl
;
},
},
Check_AutoFit
:
function
(){
return
true
;
},
createDuplicate
:
function
()
createDuplicate
:
function
()
{
{
...
@@ -12310,6 +12314,11 @@ CTitle.prototype =
...
@@ -12310,6 +12314,11 @@ CTitle.prototype =
}
}
return
false
;
return
false
;
},
},
Check_AutoFit
:
function
(){
return
true
;
},
getBodyPr
:
CDLbl
.
prototype
.
getBodyPr
,
getBodyPr
:
CDLbl
.
prototype
.
getBodyPr
,
getCompiledStyle
:
CDLbl
.
prototype
.
getCompiledStyle
,
getCompiledStyle
:
CDLbl
.
prototype
.
getCompiledStyle
,
...
...
common/Drawings/Format/Shape.js
View file @
3e693f1b
...
@@ -5113,6 +5113,7 @@ CShape.prototype.chekBodyPrTransform = function(oBodyPr)
...
@@ -5113,6 +5113,7 @@ CShape.prototype.chekBodyPrTransform = function(oBodyPr)
CShape
.
prototype
.
checkTextWarp
=
function
(
oContent
,
oBodyPr
,
dWidth
,
dHeight
,
bNeedNoTransform
,
bNeedWarp
)
CShape
.
prototype
.
checkTextWarp
=
function
(
oContent
,
oBodyPr
,
dWidth
,
dHeight
,
bNeedNoTransform
,
bNeedWarp
)
{
{
return
AscFormat
.
ExecuteNoHistory
(
function
(){
var
oRet
=
{
oTxWarpStruct
:
null
,
oTxWarpStructParamarks
:
null
,
oTxWarpStructNoTransform
:
null
,
oTxWarpStructParamarksNoTransform
:
null
};
var
oRet
=
{
oTxWarpStruct
:
null
,
oTxWarpStructParamarks
:
null
,
oTxWarpStructNoTransform
:
null
,
oTxWarpStructParamarksNoTransform
:
null
};
//return oRet;
//return oRet;
var
bTransform
=
this
.
chekBodyPrTransform
(
oBodyPr
)
&&
bNeedWarp
;
var
bTransform
=
this
.
chekBodyPrTransform
(
oBodyPr
)
&&
bNeedWarp
;
...
@@ -5264,6 +5265,7 @@ CShape.prototype.checkTextWarp = function(oContent, oBodyPr, dWidth, dHeight, bN
...
@@ -5264,6 +5265,7 @@ CShape.prototype.checkTextWarp = function(oContent, oBodyPr, dWidth, dHeight, bN
}
}
}
}
return
oRet
;
return
oRet
;
},
this
,
[]);
};
};
CShape
.
prototype
.
checkTypeCorrect
=
function
(){
CShape
.
prototype
.
checkTypeCorrect
=
function
(){
...
...
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