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
069544bf
Commit
069544bf
authored
Nov 02, 2017
by
Sergey Konovalov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tab leader
parent
99191e65
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
2 deletions
+36
-2
ASCOfficeDocxFile2/BinReader/ReaderClasses.h
ASCOfficeDocxFile2/BinReader/ReaderClasses.h
+6
-0
ASCOfficeDocxFile2/BinReader/Readers.h
ASCOfficeDocxFile2/BinReader/Readers.h
+22
-1
ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h
ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h
+2
-1
ASCOfficeDocxFile2/BinWriter/BinWriters.h
ASCOfficeDocxFile2/BinWriter/BinWriters.h
+6
-0
No files found.
ASCOfficeDocxFile2/BinReader/ReaderClasses.h
View file @
069544bf
...
...
@@ -355,10 +355,16 @@ class Tab
public:
BYTE
Val
;
double
Pos
;
BYTE
*
Leader
;
Tab
()
{
Val
=
shd_Nil
;
Pos
=
0
;
Leader
=
NULL
;
}
~
Tab
()
{
RELEASEOBJECT
(
Leader
);
}
};
class
Tabs
...
...
ASCOfficeDocxFile2/BinReader/Readers.h
View file @
069544bf
...
...
@@ -827,7 +827,23 @@ public:
case
g_tabtype_clear
:
sVal
=
L"clear"
;
break
;
default:
sVal
=
L"left"
;
break
;
}
pCStringWriter
->
WriteString
(
L"<w:tab w:val=
\"
"
+
sVal
+
L"
\"
w:pos=
\"
"
+
std
::
to_wstring
(
nTab
)
+
L"
\"
/>"
);
pCStringWriter
->
WriteString
(
L"<w:tab w:val=
\"
"
+
sVal
+
L"
\"
w:pos=
\"
"
+
std
::
to_wstring
(
nTab
)
+
L"
\"
"
);
if
(
NULL
!=
oTab
.
Leader
)
{
std
::
wstring
sLeader
;
switch
(
*
oTab
.
Leader
)
{
case
SimpleTypes
:
:
tabtlcDot
:
sLeader
=
(
L"dot"
);
case
SimpleTypes
:
:
tabtlcHeavy
:
sLeader
=
(
L"heavy"
);
case
SimpleTypes
:
:
tabtlcHyphen
:
sLeader
=
(
L"hyphen"
);
case
SimpleTypes
:
:
tabtlcMiddleDot
:
sLeader
=
(
L"middleDot"
);
case
SimpleTypes
:
:
tabtlcNone
:
sLeader
=
(
L"none"
);
case
SimpleTypes
:
:
tabtlcUnderscore
:
sLeader
=
(
L"underscore"
);
default
:
sLeader
=
(
L"none"
);
}
pCStringWriter
->
WriteString
(
L" w:leader=
\"
"
+
sLeader
+
L"
\"
"
);
}
pCStringWriter
->
WriteString
(
L"/>"
);
}
pCStringWriter
->
WriteString
(
std
::
wstring
(
L"</w:tabs>"
));
}
...
...
@@ -1008,6 +1024,11 @@ public:
poTabItem
->
Val
=
m_oBufferedStream
.
GetUChar
();
else
if
(
c_oSerProp_pPrType
::
Tab_Item_Pos
==
type
)
poTabItem
->
Pos
=
m_oBufferedStream
.
GetDouble
();
else
if
(
c_oSerProp_pPrType
::
Tab_Item_Leader
==
type
)
{
poTabItem
->
Leader
=
new
BYTE
;
*
poTabItem
->
Leader
=
m_oBufferedStream
.
GetUChar
();
}
else
res
=
c_oSerConstants
::
ReadUnknown
;
return
res
;
...
...
ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h
View file @
069544bf
...
...
@@ -345,7 +345,8 @@ extern int g_nCurFormatVersion;
SectPr
=
31
,
numPr_Ins
=
32
,
pPrChange
=
33
,
outlineLvl
=
34
outlineLvl
=
34
,
Tab_Item_Leader
=
35
};}
namespace
c_oSerProp_rPrType
{
enum
c_oSerProp_rPrType
{
...
...
ASCOfficeDocxFile2/BinWriter/BinWriters.h
View file @
069544bf
...
...
@@ -1179,6 +1179,12 @@ namespace BinDocxRW
m_oBcw
.
m_oStream
.
WriteBYTE
(
c_oSerPropLenType
::
Double
);
m_oBcw
.
m_oStream
.
WriteDouble
(
TabItem
.
m_oPos
.
get
().
ToMm
());
}
if
(
false
!=
TabItem
.
m_oLeader
.
IsInit
())
{
m_oBcw
.
m_oStream
.
WriteBYTE
(
c_oSerProp_pPrType
::
Tab_Item_Leader
);
m_oBcw
.
m_oStream
.
WriteBYTE
(
c_oSerPropLenType
::
Byte
);
m_oBcw
.
m_oStream
.
WriteBYTE
((
BYTE
)
TabItem
.
m_oLeader
->
GetValue
());
}
}
void
WriteNumPr
(
const
OOX
::
Logic
::
CNumPr
&
numPr
,
const
OOX
::
Logic
::
CParagraphProperty
&
pPr
)
{
...
...
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