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
3982ac06
Commit
3982ac06
authored
Jul 21, 2017
by
Alexander Trofimov
Committed by
GitHub
Jul 21, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #35 from ONLYOFFICE/feature/lena_fix_2
fix not compiled
parents
08e97b4a
0a5d0af8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
11 deletions
+5
-11
ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertDrawing.cpp
ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertDrawing.cpp
+5
-11
No files found.
ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertDrawing.cpp
View file @
3982ac06
...
@@ -658,15 +658,9 @@ void OoxConverter::convert(PPTX::Logic::UniFill *oox_fill, DWORD nARGB)
...
@@ -658,15 +658,9 @@ void OoxConverter::convert(PPTX::Logic::UniFill *oox_fill, DWORD nARGB)
{
{
if
(
oox_fill
==
NULL
)
return
;
if
(
oox_fill
==
NULL
)
return
;
PPTX
::
Logic
::
NoFill
*
noFill
=
NULL
;
PPTX
::
Logic
::
BlipFill
*
blipFill
=
NULL
;
PPTX
::
Logic
::
GradFill
*
gradFill
=
NULL
;
PPTX
::
Logic
::
SolidFill
*
solidFill
=
NULL
;
PPTX
::
Logic
::
PattFill
*
pattFill
=
NULL
;
if
(
oox_fill
->
is
<
PPTX
::
Logic
::
NoFill
>
())
odf_context
()
->
drawing_context
()
->
set_no_fill
();
if
(
oox_fill
->
is
<
PPTX
::
Logic
::
NoFill
>
())
odf_context
()
->
drawing_context
()
->
set_no_fill
();
if
(
oox_fill
->
is
<
PPTX
::
Logic
::
BlipFill
>
())
convert
(
&
oox_fill
->
as
<
PPTX
::
Logic
::
BlipFill
>
(),
nARGB
);
if
(
oox_fill
->
is
<
PPTX
::
Logic
::
BlipFill
>
())
convert
(
&
oox_fill
->
as
<
PPTX
::
Logic
::
BlipFill
>
()
);
if
(
oox_fill
->
is
<
PPTX
::
Logic
::
GradFill
>
())
convert
(
&
oox_fill
->
as
<
PPTX
::
Logic
::
GradFill
>
(),
nARGB
);
if
(
oox_fill
->
is
<
PPTX
::
Logic
::
GradFill
>
())
convert
(
&
oox_fill
->
as
<
PPTX
::
Logic
::
GradFill
>
(),
nARGB
);
if
(
oox_fill
->
is
<
PPTX
::
Logic
::
SolidFill
>
())
convert
(
&
oox_fill
->
as
<
PPTX
::
Logic
::
SolidFill
>
(),
nARGB
);
if
(
oox_fill
->
is
<
PPTX
::
Logic
::
SolidFill
>
())
convert
(
&
oox_fill
->
as
<
PPTX
::
Logic
::
SolidFill
>
(),
nARGB
);
if
(
oox_fill
->
is
<
PPTX
::
Logic
::
PattFill
>
())
convert
(
&
oox_fill
->
as
<
PPTX
::
Logic
::
PattFill
>
(),
nARGB
);
if
(
oox_fill
->
is
<
PPTX
::
Logic
::
PattFill
>
())
convert
(
&
oox_fill
->
as
<
PPTX
::
Logic
::
PattFill
>
(),
nARGB
);
...
...
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