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
c329f29e
Commit
c329f29e
authored
Feb 16, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
RtfFormatReader - fix hyperlink text
parent
0f3a02ca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
ASCOfficeRtfFile/RtfFormatLib/source/DestinationCommand.cpp
ASCOfficeRtfFile/RtfFormatLib/source/DestinationCommand.cpp
+1
-1
ASCOfficeRtfFile/RtfFormatLib/source/RtfField.cpp
ASCOfficeRtfFile/RtfFormatLib/source/RtfField.cpp
+4
-1
No files found.
ASCOfficeRtfFile/RtfFormatLib/source/DestinationCommand.cpp
View file @
c329f29e
...
...
@@ -1622,7 +1622,7 @@ bool RtfFieldReader::ExecuteCommand(RtfDocument& oDocument, RtfReader& oReader,
m_oField
.
m_pResult
=
oNewFieldInst
;
}
oReader
.
m_oLex
.
putString
(
"}{"
);
//чтобы не терять после fldrslt
//
oReader.m_oLex.putString( "}{" );//чтобы не терять после fldrslt
//{\field{\*\fldinst...}{\*\fldrslt...} ??? }
//{\field{\*\fldinst...}{\*\fldrslt...}}{ ??? }
}
...
...
ASCOfficeRtfFile/RtfFormatLib/source/RtfField.cpp
View file @
c329f29e
...
...
@@ -100,7 +100,10 @@ std::wstring RtfFieldInst::RenderToOOX(RenderParameter oRenderParameter)
RtfDocument
*
poRtfDocument
=
static_cast
<
RtfDocument
*>
(
oRenderParameter
.
poDocument
);
OOXWriter
*
poOOXWriter
=
static_cast
<
OOXWriter
*>
(
oRenderParameter
.
poWriter
);
return
L""
;
if
(
m_pTextItems
)
return
m_pTextItems
->
RenderToOOX
(
oRenderParameter
);
else
return
L""
;
}
std
::
wstring
RtfField
::
RenderToRtf
(
RenderParameter
oRenderParameter
)
{
...
...
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