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
1ee1e2e2
Commit
1ee1e2e2
authored
Oct 20, 2016
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
3d47a865
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
246 additions
and
249 deletions
+246
-249
ASCOfficeDocxFile2/BinWriter/BinEquationWriter.h
ASCOfficeDocxFile2/BinWriter/BinEquationWriter.h
+4
-4
Common/DocxFormat/Source/DocxFormat/Math/oMath.cpp
Common/DocxFormat/Source/DocxFormat/Math/oMath.cpp
+1
-1
Common/DocxFormat/Source/MathEquation/LEStream.h
Common/DocxFormat/Source/MathEquation/LEStream.h
+2
-2
Common/DocxFormat/Source/MathEquation/MathEquation.cpp
Common/DocxFormat/Source/MathEquation/MathEquation.cpp
+3
-3
Common/DocxFormat/Source/MathEquation/MathEquation.h
Common/DocxFormat/Source/MathEquation/MathEquation.h
+1
-1
Common/DocxFormat/Source/MathEquation/OutputDev.h
Common/DocxFormat/Source/MathEquation/OutputDev.h
+1
-1
Common/DocxFormat/Source/MathEquation/StringOutput.h
Common/DocxFormat/Source/MathEquation/StringOutput.h
+234
-234
Common/DocxFormat/Source/MathEquation/Types.h
Common/DocxFormat/Source/MathEquation/Types.h
+0
-3
No files found.
ASCOfficeDocxFile2/BinWriter/BinEquationWriter.h
View file @
1ee1e2e2
...
...
@@ -453,7 +453,7 @@ namespace MathEquation
{
nTextSize
=
nSize
*
2
;
}
virtual
void
BeginChar
(
Unicode_t
uChar
,
uint8_t
nTypeFace
,
bool
bSpecialSymbol
)
virtual
void
BeginChar
(
unsigned
short
uChar
,
unsigned
char
nTypeFace
,
bool
bSpecialSymbol
)
{
bool
bIsOpen
;
if
(
!
m_aCommandStack
.
empty
())
...
...
@@ -540,7 +540,7 @@ namespace MathEquation
}
}*/
}
virtual
void
BeginMatrix
(
uint8_t
nVAlign
,
MMATRIXHORALIGN
eHorAlign
,
MMATRIXVERALIGN
eVerAlign
,
bool
bEqualRows
,
bool
bEqualCols
,
uint8_t
nRows
,
uint8_t
nCols
,
uint8_t
*
pVerBorders
,
uint8_t
*
pHorBorders
)
virtual
void
BeginMatrix
(
unsigned
char
nVAlign
,
MMATRIXHORALIGN
eHorAlign
,
MMATRIXVERALIGN
eVerAlign
,
bool
bEqualRows
,
bool
bEqualCols
,
unsigned
char
nRows
,
unsigned
char
nCols
,
unsigned
char
*
pVerBorders
,
unsigned
char
*
pHorBorders
)
{
if
(
!
oRManager
.
IsEmpty
())
WriteRun
();
...
...
@@ -587,7 +587,7 @@ namespace MathEquation
m_aMatrixStack
.
pop
();
}
}
virtual
void
StartPile
(
uint8_t
nHAlign
,
uint8_t
nVAlign
)
virtual
void
StartPile
(
unsigned
char
nHAlign
,
unsigned
char
nVAlign
)
{
switch
(
nHAlign
)
{
...
...
@@ -1490,7 +1490,7 @@ namespace MathEquation
}
}
void
AddFont
(
uint8_t
nTypeFace
,
std
::
string
sName
,
bool
bBold
,
bool
bItalic
)
void
AddFont
(
unsigned
char
nTypeFace
,
std
::
string
sName
,
bool
bBold
,
bool
bItalic
)
{
TMathFont
aFont
;
aFont
.
sName
=
sName
;
...
...
Common/DocxFormat/Source/DocxFormat/Math/oMath.cpp
View file @
1ee1e2e2
...
...
@@ -172,4 +172,4 @@ namespace OOX
}
}
}
//namespace Logic
}
//namespace OOX
\ No newline at end of file
}
//namespace OOX
Common/DocxFormat/Source/MathEquation/LEStream.h
View file @
1ee1e2e2
...
...
@@ -109,12 +109,12 @@ public :
nValue
=
ReadUInt32
();
}
void
operator
>>
(
int8_t
&
nValue
)
void
operator
>>
(
char
&
nValue
)
{
nValue
=
ReadUInt8
();
}
void
operator
>>
(
int16_
t
&
nValue
)
void
operator
>>
(
shor
t
&
nValue
)
{
nValue
=
ReadUInt16
();
}
...
...
Common/DocxFormat/Source/MathEquation/MathEquation.cpp
View file @
1ee1e2e2
...
...
@@ -225,7 +225,7 @@ void CEquationReader::HandleNudge()
}
int
CEquationReader
::
HandleChar
(
unsigned
char
nTag
)
{
Unicode_
t
nChar
;
unsigned
shor
t
nChar
;
int
nRet
=
1
;
if
(
xfAUTO
(
nTag
))
...
...
@@ -749,7 +749,7 @@ void CEquationReader::HandleFont()
*
pS
>>
nTFace
;
*
pS
>>
nStyle
;
Char_t
nChar8
;
char
nChar8
;
do
{
*
pS
>>
nChar8
;
...
...
@@ -760,7 +760,7 @@ void CEquationReader::HandleFont()
pOutputDev
->
AddFont
(
128
-
nTFace
,
sName
.
GetValue
(),
nStyle
&
0x01
,
nStyle
&
0x02
);
}
bool
CEquationReader
::
IsSpecialChar
(
Unicode_
t
nChar
)
bool
CEquationReader
::
IsSpecialChar
(
unsigned
shor
t
nChar
)
{
switch
(
nChar
)
{
...
...
Common/DocxFormat/Source/MathEquation/MathEquation.h
View file @
1ee1e2e2
...
...
@@ -111,7 +111,7 @@ namespace MathEquation
void
HandleSetSize
(
MTOKENS
eType
);
void
HandleRuler
();
void
HandleFont
();
bool
IsSpecialChar
(
Unicode_
t
nChar
);
bool
IsSpecialChar
(
unsigned
shor
t
nChar
);
private:
...
...
Common/DocxFormat/Source/MathEquation/OutputDev.h
View file @
1ee1e2e2
...
...
@@ -54,7 +54,7 @@ namespace MathEquation
virtual
void
SetSize
(
_UINT16
nSize
)
=
0
;
// Добавляем символ. К символу могут быть добавлены разные элементы. Зачеркивание, добавление акцента и т.д.
virtual
void
BeginChar
(
Unicode_
t
uChar
,
unsigned
char
nTypeFace
,
bool
bSpecialSymbol
)
=
0
;
virtual
void
BeginChar
(
unsigned
shor
t
uChar
,
unsigned
char
nTypeFace
,
bool
bSpecialSymbol
)
=
0
;
virtual
void
AddCharEmbel
(
MEMBELTYPE
eType
)
=
0
;
virtual
void
EndChar
()
=
0
;
...
...
Common/DocxFormat/Source/MathEquation/StringOutput.h
View file @
1ee1e2e2
This diff is collapsed.
Click to expand it.
Common/DocxFormat/Source/MathEquation/Types.h
View file @
1ee1e2e2
...
...
@@ -38,9 +38,6 @@
namespace
MathEquation
{
typedef
unsigned
short
Unicode_t
;
typedef
signed
char
Char_t
;
struct
TMathFont
{
std
::
string
sName
;
...
...
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