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
b782624f
Commit
b782624f
authored
Nov 15, 2016
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
..
parent
c1a9f82a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
5 deletions
+14
-5
ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXParagraphElementReaders.cpp
...RtfFormatLib/source/Reader/OOXParagraphElementReaders.cpp
+8
-2
ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXTableReader.cpp
...ficeRtfFile/RtfFormatLib/source/Reader/OOXTableReader.cpp
+5
-2
X2tConverter/build/Qt/X2tConverter.pri
X2tConverter/build/Qt/X2tConverter.pri
+1
-1
No files found.
ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXParagraphElementReaders.cpp
View file @
b782624f
...
...
@@ -1470,7 +1470,10 @@ bool OOXrPrReader::Parse( ReaderParameter oParam ,RtfCharProperty& oOutputProper
oOutputProperty
.
m_nRevauth
=
oParam
.
oRtf
->
m_oRevisionTable
.
AddAuthor
(
m_ooxRunProps
->
m_oIns
->
m_sAuthor
.
get2
()
)
+
1
;
if
(
m_ooxRunProps
->
m_oIns
->
m_oDate
.
IsInit
())
oOutputProperty
.
m_nRevdttm
=
RtfUtility
::
convertDateTime
(
string2std_string
(
m_ooxRunProps
->
m_oIns
->
m_oDate
->
GetValue
())
);
{
std
::
wstring
sVal
=
string2std_string
(
m_ooxRunProps
->
m_oIns
->
m_oDate
->
GetValue
());
oOutputProperty
.
m_nRevdttm
=
RtfUtility
::
convertDateTime
(
sVal
);
}
}
if
(
m_ooxRunProps
->
m_oDel
.
IsInit
())
{
...
...
@@ -1480,7 +1483,10 @@ bool OOXrPrReader::Parse( ReaderParameter oParam ,RtfCharProperty& oOutputProper
oOutputProperty
.
m_nRevauthDel
=
oParam
.
oRtf
->
m_oRevisionTable
.
AddAuthor
(
m_ooxRunProps
->
m_oDel
->
m_sAuthor
.
get2
()
)
+
1
;
if
(
m_ooxRunProps
->
m_oDel
->
m_oDate
.
IsInit
())
oOutputProperty
.
m_nRevdttmDel
=
RtfUtility
::
convertDateTime
(
string2std_string
(
m_ooxRunProps
->
m_oDel
->
m_oDate
->
GetValue
())
);
{
std
::
wstring
sVal
=
string2std_string
(
m_ooxRunProps
->
m_oDel
->
m_oDate
->
GetValue
());
oOutputProperty
.
m_nRevdttmDel
=
RtfUtility
::
convertDateTime
(
sVal
);
}
}
if
(
m_ooxRunProps
->
m_oRPrChange
.
IsInit
())
...
...
ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXTableReader.cpp
View file @
b782624f
...
...
@@ -102,7 +102,10 @@ bool OOXtrPrReader::Parse( ReaderParameter oParam , RtfRowProperty& oOutputPrope
oOutputProperty
.
m_nTrAuth
=
oParam
.
oRtf
->
m_oRevisionTable
.
AddAuthor
(
m_ooxTableRowProps
->
m_oTrPrChange
->
m_sAuthor
.
get2
()
)
+
1
;
if
(
m_ooxTableRowProps
->
m_oTrPrChange
->
m_oDate
.
IsInit
())
oOutputProperty
.
m_nTrDate
=
RtfUtility
::
convertDateTime
(
string2std_string
(
m_ooxTableRowProps
->
m_oTrPrChange
->
m_oDate
->
GetValue
()));
{
std
::
wstring
sVal
=
string2std_string
(
m_ooxTableRowProps
->
m_oTrPrChange
->
m_oDate
->
GetValue
());
oOutputProperty
.
m_nTrDate
=
RtfUtility
::
convertDateTime
(
sVal
);
}
RtfRowPropertyPtr
props
(
new
RtfRowProperty
()
);
OOXtrPrReader
oTrReader
(
m_ooxTableRowProps
->
m_oTrPrChange
->
m_pTrPr
.
GetPointer
());
...
...
@@ -217,4 +220,4 @@ void OOXTableReader::ApplyParagraphProperty( RtfTable& oOutputTable )
}
}
}
}
\ No newline at end of file
}
X2tConverter/build/Qt/X2tConverter.pri
View file @
b782624f
...
...
@@ -7,7 +7,7 @@
QT -= core
QT -= gui
VERSION = 2.0.2.40
7
VERSION = 2.0.2.40
8
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