Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
onlyoffice_core
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
onlyoffice_core
Commits
66b45dba
Commit
66b45dba
authored
Aug 18, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix users file
parent
2ce57085
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
ASCOfficeDocxFile2/BinWriter/BinWriters.h
ASCOfficeDocxFile2/BinWriter/BinWriters.h
+1
-1
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
+1
-2
No files found.
ASCOfficeDocxFile2/BinWriter/BinWriters.h
View file @
66b45dba
...
...
@@ -3025,7 +3025,7 @@ namespace BinDocxRW
std
::
wstring
&
sShapeType
=
aShapeTypes
[
i
];
pOfficeDrawingConverter
->
AddShapeType
(
sShapeType
);
}
pOfficeDrawingConverter
->
SetRels
(
oldRels
);
pOfficeDrawingConverter
->
SetRels
(
oldRels
);
}
void
WriteVbaProjectContent
(
OOX
::
VbaProject
&
oVbaProject
)
{
...
...
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
View file @
66b45dba
...
...
@@ -2228,8 +2228,7 @@ void CDrawingConverter::doc_LoadShape(PPTX::Logic::SpTreeElem *elem, XmlUtils::C
std
::
wstring
strPos
=
arSplit
[
i
].
substr
(
0
,
p
);
std
::
wstring
strColor
=
arSplit
[
i
].
substr
(
p
+
1
);
double
pos
;
pos
=
_wtof
(
strPos
.
c_str
());
double
pos
=
strPos
.
empty
()
?
0
:
_wtof
(
strPos
.
c_str
());
NSPresentationEditor
::
CColor
color
=
NS_DWC_Common
::
getColorFromString
(
strColor
);
PPTX
::
Logic
::
UniColor
*
oColor
=
new
PPTX
::
Logic
::
UniColor
();
...
...
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