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
83bae8fa
Commit
83bae8fa
authored
Nov 22, 2016
by
konovalovsergey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
for bug 33490
parent
623d89d1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
1 deletion
+30
-1
ASCOfficeDocxFile2/BinReader/Readers.h
ASCOfficeDocxFile2/BinReader/Readers.h
+11
-0
ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h
ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h
+2
-1
ASCOfficeDocxFile2/BinWriter/BinWriters.h
ASCOfficeDocxFile2/BinWriter/BinWriters.h
+6
-0
Common/DocxFormat/Source/DocxFormat/Math/oMathContent.h
Common/DocxFormat/Source/DocxFormat/Math/oMathContent.h
+11
-0
No files found.
ASCOfficeDocxFile2/BinReader/Readers.h
View file @
83bae8fa
...
@@ -4404,6 +4404,17 @@ public:
...
@@ -4404,6 +4404,17 @@ public:
if
(
m_oMath_rPr
.
IsNoEmpty
())
if
(
m_oMath_rPr
.
IsNoEmpty
())
m_oMath_rPr
.
Write
(
&
GetRunStringWriter
());
m_oMath_rPr
.
Write
(
&
GetRunStringWriter
());
}
}
else
if
(
c_oSerRunType
::
arPr
==
type
)
{
PPTX
::
Logic
::
RunProperties
rPr
;
m_oBufferedStream
.
Skip
(
1
);
//skip type
rPr
.
fromPPTY
(
&
m_oBufferedStream
);
rPr
.
m_name
=
L"a:rPr"
;
//todo use one writer
NSBinPptxRW
::
CXmlWriter
oWriter
;
rPr
.
toXmlWriter
(
&
oWriter
);
GetRunStringWriter
().
WriteString
(
oWriter
.
GetXmlString
());
}
else
if
(
c_oSerRunType
::
del
==
type
)
else
if
(
c_oSerRunType
::
del
==
type
)
{
{
TrackRevision
oRPrChange
;
TrackRevision
oRPrChange
;
...
...
ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h
View file @
83bae8fa
...
@@ -503,7 +503,8 @@ extern int g_nCurFormatVersion;
...
@@ -503,7 +503,8 @@ extern int g_nCurFormatVersion;
footnoteRef
=
24
,
footnoteRef
=
24
,
endnoteRef
=
25
,
endnoteRef
=
25
,
footnoteReference
=
26
,
footnoteReference
=
26
,
endnoteReference
=
27
endnoteReference
=
27
,
arPr
=
28
};}
};}
namespace
c_oSerImageType
{
enum
c_oSerImageType
namespace
c_oSerImageType
{
enum
c_oSerImageType
{
{
...
...
ASCOfficeDocxFile2/BinWriter/BinWriters.h
View file @
83bae8fa
...
@@ -3966,6 +3966,12 @@ namespace BinDocxRW
...
@@ -3966,6 +3966,12 @@ namespace BinDocxRW
brPrs
.
Write_rPr
(
pCtrlPr
.
m_oRPr
.
get
());
brPrs
.
Write_rPr
(
pCtrlPr
.
m_oRPr
.
get
());
m_oBcw
.
WriteItemEnd
(
nCurPos2
);
m_oBcw
.
WriteItemEnd
(
nCurPos2
);
}
}
if
(
pCtrlPr
.
m_oARPr
.
IsInit
()
)
{
int
nCurPos2
=
m_oBcw
.
WriteItemStart
(
c_oSerRunType
::
arPr
);
m_oBcw
.
m_oStream
.
WriteRecord2
(
0
,
pCtrlPr
.
m_oARPr
);
m_oBcw
.
WriteItemEnd
(
nCurPos2
);
}
if
(
pCtrlPr
.
m_oDel
.
IsInit
()
)
if
(
pCtrlPr
.
m_oDel
.
IsInit
()
)
{
{
int
nCurPos2
=
m_oBcw
.
WriteItemStart
(
c_oSerRunType
::
del
);
int
nCurPos2
=
m_oBcw
.
WriteItemStart
(
c_oSerRunType
::
del
);
...
...
Common/DocxFormat/Source/DocxFormat/Math/oMathContent.h
View file @
83bae8fa
...
@@ -600,6 +600,14 @@ namespace OOX
...
@@ -600,6 +600,14 @@ namespace OOX
std
::
wstring
sName
=
oReader
.
GetName
();
std
::
wstring
sName
=
oReader
.
GetName
();
if
(
_T
(
"w:rPr"
)
==
sName
)
if
(
_T
(
"w:rPr"
)
==
sName
)
m_oRPr
=
oReader
;
m_oRPr
=
oReader
;
else
if
(
_T
(
"a:rPr"
)
==
sName
)
{
CString
sXml
=
oReader
.
GetOuterXml
();
XmlUtils
::
CXmlNode
node
;
node
.
FromXmlString
(
sXml
.
GetBuffer
());
sXml
.
ReleaseBuffer
();
m_oARPr
=
node
;
}
else
if
(
_T
(
"w:ins"
)
==
sName
)
else
if
(
_T
(
"w:ins"
)
==
sName
)
m_oIns
=
oReader
;
m_oIns
=
oReader
;
else
if
(
_T
(
"w:del"
)
==
sName
)
else
if
(
_T
(
"w:del"
)
==
sName
)
...
@@ -612,6 +620,8 @@ namespace OOX
...
@@ -612,6 +620,8 @@ namespace OOX
if
(
m_oRPr
.
IsInit
()
)
if
(
m_oRPr
.
IsInit
()
)
sResult
+=
m_oRPr
->
toXML
();
sResult
+=
m_oRPr
->
toXML
();
if
(
m_oARPr
.
IsInit
()
)
sResult
+=
m_oARPr
->
toXML
();
if
(
m_oIns
.
IsInit
()
)
if
(
m_oIns
.
IsInit
()
)
sResult
+=
m_oIns
->
toXML
();
sResult
+=
m_oIns
->
toXML
();
if
(
m_oDel
.
IsInit
()
)
if
(
m_oDel
.
IsInit
()
)
...
@@ -629,6 +639,7 @@ namespace OOX
...
@@ -629,6 +639,7 @@ namespace OOX
public:
public:
//Childs
//Childs
nullable
<
OOX
::
Logic
::
CRunProperty
>
m_oRPr
;
nullable
<
OOX
::
Logic
::
CRunProperty
>
m_oRPr
;
nullable
<
PPTX
::
Logic
::
RunProperties
>
m_oARPr
;
nullable
<
OOX
::
Logic
::
CRPrChange
>
m_oIns
;
nullable
<
OOX
::
Logic
::
CRPrChange
>
m_oIns
;
nullable
<
OOX
::
Logic
::
CRPrChange
>
m_oDel
;
nullable
<
OOX
::
Logic
::
CRPrChange
>
m_oDel
;
};
};
...
...
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