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
3c73f692
Commit
3c73f692
authored
Nov 17, 2016
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x2t linux 64 build 2.0.2.409
parent
32d90264
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
6 deletions
+12
-6
ASCOfficeRtfFile/RtfFormatLib/source/RtfBookmark.cpp
ASCOfficeRtfFile/RtfFormatLib/source/RtfBookmark.cpp
+7
-3
ASCOfficeRtfFile/RtfFormatLib/source/RtfProperty.cpp
ASCOfficeRtfFile/RtfFormatLib/source/RtfProperty.cpp
+4
-2
X2tConverter/build/Qt/X2tConverter.pri
X2tConverter/build/Qt/X2tConverter.pri
+1
-1
No files found.
ASCOfficeRtfFile/RtfFormatLib/source/RtfBookmark.cpp
View file @
3c73f692
...
...
@@ -48,7 +48,8 @@ CString RtfBookmarkStart::RenderToRtf(RenderParameter oRenderParameter)
sResult
.
AppendFormat
(
L"
\\
bkmkcoll%d"
,
nLastColumn
);
sResult
+=
L" "
;
sResult
+=
RtfChar
::
renderRtfText
(
m_sName
,
oRenderParameter
.
poDocument
,
NULL
);
RtfCharProperty
*
pCharProperty
=
NULL
;
sResult
+=
RtfChar
::
renderRtfText
(
m_sName
,
oRenderParameter
.
poDocument
,
pCharProperty
);
sResult
+=
L"}"
;
return
sResult
;
}
...
...
@@ -86,8 +87,11 @@ CString RtfBookmarkEnd::RenderToRtf(RenderParameter oRenderParameter)
sResult
+=
L"{
\\
*
\\
bkmkend"
;
sResult
+=
L" "
;
sResult
+=
RtfChar
::
renderRtfText
(
m_sName
,
oRenderParameter
.
poDocument
,
NULL
);
sResult
+=
L"}"
;
RtfCharProperty
*
pCharProperty
=
NULL
;
sResult
+=
RtfChar
::
renderRtfText
(
m_sName
,
oRenderParameter
.
poDocument
,
pCharProperty
);
sResult
+=
L"}"
;
return
sResult
;
}
...
...
ASCOfficeRtfFile/RtfFormatLib/source/RtfProperty.cpp
View file @
3c73f692
...
...
@@ -1931,8 +1931,10 @@ CString RtfParagraphProperty::RenderToRtf(RenderParameter oRenderParameter)
sResult
+=
poLevelProp
.
m_oCharProp
.
RenderToRtf
(
oRenderParameter
);
//пишем текст
CString
strLevelProp
=
poLevelProp
.
GenerateListText
();
CString
strChar
=
RtfChar
::
renderRtfText
(
strLevelProp
,
oRenderParameter
.
poDocument
,
NULL
);
sResult
+=
strChar
;
RtfCharProperty
*
pCharProperty
=
NULL
;
sResult
+=
RtfChar
::
renderRtfText
(
strLevelProp
,
oRenderParameter
.
poDocument
,
pCharProperty
);
//или картинку
if
(
PROP_DEF
!=
poLevelProp
.
m_nPictureIndex
)
{
...
...
X2tConverter/build/Qt/X2tConverter.pri
View file @
3c73f692
...
...
@@ -7,7 +7,7 @@
QT -= core
QT -= gui
VERSION = 2.0.2.40
8
VERSION = 2.0.2.40
9
DEFINES += INTVER=$$VERSION
TARGET = x2t
...
...
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