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
db834666
Commit
db834666
authored
May 03, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OdfFormatWriter - colored hyperlink int shape
parent
6ed0e131
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
1 deletion
+19
-1
ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertDrawing.cpp
ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertDrawing.cpp
+19
-1
No files found.
ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertDrawing.cpp
View file @
db834666
...
@@ -1825,9 +1825,27 @@ void OoxConverter::convert(PPTX::Logic::Run *oox_run)
...
@@ -1825,9 +1825,27 @@ void OoxConverter::convert(PPTX::Logic::Run *oox_run)
if
((
oox_run
->
rPr
.
IsInit
())
&&
(
oox_run
->
rPr
->
hlinkClick
.
IsInit
())
&&
(
oox_run
->
rPr
->
hlinkClick
->
id
.
IsInit
()))
if
((
oox_run
->
rPr
.
IsInit
())
&&
(
oox_run
->
rPr
->
hlinkClick
.
IsInit
())
&&
(
oox_run
->
rPr
->
hlinkClick
->
id
.
IsInit
()))
{
{
odf_writer
::
style_text_properties
*
text_properties
=
odf_context
()
->
text_context
()
->
get_text_properties
();
if
(
!
text_properties
->
content_
.
fo_color_
)
{
PPTX
::
Logic
::
UniColor
colorLink
;
colorLink
.
Color
.
reset
(
new
PPTX
::
Logic
::
SchemeClr
());
PPTX
::
Logic
::
SchemeClr
&
clr
=
colorLink
.
as
<
PPTX
::
Logic
::
SchemeClr
>
();
clr
.
val
.
set
(
L"hlink"
);
std
::
wstring
strHexColor
;
_CP_OPT
(
double
)
opacity
;
convert
(
&
colorLink
,
strHexColor
,
opacity
);
if
(
!
strHexColor
.
empty
())
text_properties
->
content_
.
fo_color_
=
strHexColor
;
}
text_properties
->
content_
.
style_text_underline_type_
=
odf_types
::
line_type
::
Single
;
text_properties
->
content_
.
style_text_underline_style_
=
odf_types
::
line_style
::
Solid
;
std
::
wstring
hlink
=
find_link_by_id
(
oox_run
->
rPr
->
hlinkClick
->
id
.
get
(),
2
);
std
::
wstring
hlink
=
find_link_by_id
(
oox_run
->
rPr
->
hlinkClick
->
id
.
get
(),
2
);
odf_context
()
->
text_context
()
->
add_hyperlink
(
hlink
,
oox_run
->
GetText
());
odf_context
()
->
text_context
()
->
add_hyperlink
(
hlink
,
oox_run
->
GetText
());
}
}
else
else
{
{
...
...
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