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
97fb3162
Commit
97fb3162
authored
Aug 03, 2017
by
konovalovsergey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
internal onlyoffice field for comment time
parent
a6072822
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
33 additions
and
3 deletions
+33
-3
ASCOfficeDocxFile2/BinReader/ReaderClasses.h
ASCOfficeDocxFile2/BinReader/ReaderClasses.h
+9
-1
ASCOfficeDocxFile2/BinReader/Readers.h
ASCOfficeDocxFile2/BinReader/Readers.h
+5
-0
ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h
ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h
+2
-1
ASCOfficeDocxFile2/BinWriter/BinWriters.h
ASCOfficeDocxFile2/BinWriter/BinWriters.h
+5
-0
Common/DocxFormat/Source/DocxFormat/Comments.h
Common/DocxFormat/Source/DocxFormat/Comments.h
+4
-0
XlsxSerializerCom/Common/BinReaderWriterDefines.h
XlsxSerializerCom/Common/BinReaderWriterDefines.h
+2
-1
XlsxSerializerCom/Common/Common.h
XlsxSerializerCom/Common/Common.h
+1
-0
XlsxSerializerCom/Reader/BinaryWriter.h
XlsxSerializerCom/Reader/BinaryWriter.h
+5
-0
No files found.
ASCOfficeDocxFile2/BinReader/ReaderClasses.h
View file @
97fb3162
...
...
@@ -1583,6 +1583,7 @@ public:
std
::
wstring
UserName
;
std
::
wstring
UserId
;
std
::
wstring
Date
;
std
::
wstring
OOData
;
bool
Solved
;
std
::
wstring
Text
;
std
::
wstring
m_sParaId
;
...
...
@@ -1706,9 +1707,16 @@ public:
{
std
::
wstring
sDate
=
XmlUtils
::
EncodeXmlString
(
pComment
->
Date
);
sRes
+=
L" w:date=
\"
"
;
sRes
+=
sDate
;
sRes
+=
sDate
;
sRes
+=
L"
\"
"
;
}
if
(
false
==
pComment
->
OOData
.
empty
())
{
std
::
wstring
sData
=
XmlUtils
::
EncodeXmlString
(
pComment
->
OOData
);
sRes
+=
L" oodata=
\"
"
;
sRes
+=
sData
;
sRes
+=
L"
\"
"
;
}
if
(
false
==
sInitials
.
empty
())
{
sInitials
=
XmlUtils
::
EncodeXmlString
(
sInitials
);
...
...
ASCOfficeDocxFile2/BinReader/Readers.h
View file @
97fb3162
...
...
@@ -3039,6 +3039,11 @@ public:
std
::
wstring
Date
(
m_oBufferedStream
.
GetString3
(
length
));
pComment
->
Date
=
Date
;
}
else
if
(
c_oSer_CommentsType
::
OOData
==
type
)
{
std
::
wstring
Data
(
m_oBufferedStream
.
GetString3
(
length
));
pComment
->
OOData
=
Data
;
}
else
if
(
c_oSer_CommentsType
::
Text
==
type
)
{
std
::
wstring
Text
(
m_oBufferedStream
.
GetString3
(
length
));
...
...
ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h
View file @
97fb3162
...
...
@@ -716,7 +716,8 @@ extern int g_nCurFormatVersion;
Text
=
6
,
QuoteText
=
7
,
Solved
=
8
,
Replies
=
9
Replies
=
9
,
OOData
=
10
};}
namespace
c_oSer_SettingsType
{
enum
c_oSer_SettingsType
{
...
...
ASCOfficeDocxFile2/BinWriter/BinWriters.h
View file @
97fb3162
...
...
@@ -7222,6 +7222,11 @@ namespace BinDocxRW
m_oBcw
.
m_oStream
.
WriteBYTE
(
c_oSer_CommentsType
::
Date
);
m_oBcw
.
m_oStream
.
WriteStringW
(
pComment
->
m_oDate
->
ToString
());
}
if
(
pComment
->
m_oOOData
.
IsInit
())
{
m_oBcw
.
m_oStream
.
WriteBYTE
(
c_oSer_CommentsType
::
OOData
);
m_oBcw
.
m_oStream
.
WriteStringW
(
pComment
->
m_oOOData
.
get2
());
}
if
(
pComment
->
m_oId
.
IsInit
())
{
nCurPos
=
m_oBcw
.
WriteItemStart
(
c_oSer_CommentsType
::
Id
);
...
...
Common/DocxFormat/Source/DocxFormat/Comments.h
View file @
97fb3162
...
...
@@ -275,6 +275,7 @@ namespace OOX
WritingElement_ReadAttributes_Start
(
oReader
)
WritingElement_ReadAttributes_Read_if
(
oReader
,
_T
(
"w:author"
),
m_oAuthor
)
WritingElement_ReadAttributes_Read_else_if
(
oReader
,
_T
(
"w:date"
),
m_oDate
)
WritingElement_ReadAttributes_Read_else_if
(
oReader
,
_T
(
"oodata"
),
m_oOOData
)
WritingElement_ReadAttributes_Read_else_if
(
oReader
,
_T
(
"w:id"
),
m_oId
)
WritingElement_ReadAttributes_Read_else_if
(
oReader
,
_T
(
"w:initials"
),
m_oInitials
)
WritingElement_ReadAttributes_End
(
oReader
)
...
...
@@ -289,6 +290,9 @@ namespace OOX
nullable
<
SimpleTypes
::
CDecimalNumber
<>
>
m_oId
;
nullable
<
std
::
wstring
>
m_oInitials
;
//teamlab editor information!!!
nullable
<
std
::
wstring
>
m_oOOData
;
// Childs
};
...
...
XlsxSerializerCom/Common/BinReaderWriterDefines.h
View file @
97fb3162
...
...
@@ -656,7 +656,8 @@ namespace BinXlsxRW
Solved
=
5
,
Document
=
6
,
Replies
=
7
,
Reply
=
8
Reply
=
8
,
OOTime
=
9
};}
namespace
c_oSer_ConditionalFormatting
{
enum
c_oSer_ConditionalFormatting
{
...
...
XlsxSerializerCom/Common/Common.h
View file @
97fb3162
...
...
@@ -51,6 +51,7 @@ namespace SerializeCommon
public
:
std
::
wstring
sText
;
std
::
wstring
sTime
;
std
::
wstring
sOOTime
;
std
::
wstring
sUserId
;
std
::
wstring
sUserName
;
std
::
wstring
sQuoteText
;
...
...
XlsxSerializerCom/Reader/BinaryWriter.h
View file @
97fb3162
...
...
@@ -3481,6 +3481,11 @@ namespace BinXlsxRW
m_oBcw
.
m_oStream
.
WriteBYTE
(
c_oSer_CommentData
::
Time
);
m_oBcw
.
m_oStream
.
WriteStringW
(
pCommentData
->
sTime
);
}
if
(
!
pCommentData
->
sOOTime
.
empty
())
{
m_oBcw
.
m_oStream
.
WriteBYTE
(
c_oSer_CommentData
::
OOTime
);
m_oBcw
.
m_oStream
.
WriteStringW
(
pCommentData
->
sOOTime
);
}
if
(
!
pCommentData
->
sUserId
.
empty
())
{
m_oBcw
.
m_oStream
.
WriteBYTE
(
c_oSer_CommentData
::
UserId
);
...
...
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