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
0941203a
Commit
0941203a
authored
Apr 11, 2016
by
konovalovsergey
Committed by
Alexander Trofimov
May 21, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug #32152 - Теряется символ неразрывного дефиса после сборки файла.
parent
72c43c3e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
ASCOfficeDocxFile2/BinReader/Readers.h
ASCOfficeDocxFile2/BinReader/Readers.h
+2
-2
ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h
ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h
+1
-1
ASCOfficeDocxFile2/BinWriter/BinWriters.h
ASCOfficeDocxFile2/BinWriter/BinWriters.h
+2
-2
Common/DocxFormat/Source/DocxFormat/Logic/RunContent.h
Common/DocxFormat/Source/DocxFormat/Logic/RunContent.h
+1
-1
No files found.
ASCOfficeDocxFile2/BinReader/Readers.h
View file @
0941203a
...
...
@@ -5717,9 +5717,9 @@ public:
{
GetRunStringWriter
().
WriteString
(
CString
(
_T
(
"<w:cr/>"
)));
}
else
if
(
c_oSerRunType
::
no
n
BreakHyphen
==
type
)
else
if
(
c_oSerRunType
::
noBreakHyphen
==
type
)
{
GetRunStringWriter
().
WriteString
(
CString
(
_T
(
"<w:no
n
BreakHyphen/>"
)));
GetRunStringWriter
().
WriteString
(
CString
(
_T
(
"<w:noBreakHyphen/>"
)));
}
else
if
(
c_oSerRunType
::
softHyphen
==
type
)
{
...
...
ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h
View file @
0941203a
...
...
@@ -454,7 +454,7 @@ extern int g_nCurFormatVersion;
ins
=
17
,
columnbreak
=
18
,
cr
=
19
,
no
n
BreakHyphen
=
20
,
noBreakHyphen
=
20
,
softHyphen
=
21
};}
namespace
c_oSerImageType
{
enum
c_oSerImageType
...
...
ASCOfficeDocxFile2/BinWriter/BinWriters.h
View file @
0941203a
...
...
@@ -4911,9 +4911,9 @@ namespace BinDocxRW
}
}
break
;
case
OOX
:
:
et_w_no
n
BreakHyphen
:
case
OOX
:
:
et_w_noBreakHyphen
:
{
m_oBcw
.
m_oStream
.
WriteBYTE
(
c_oSerRunType
::
no
n
BreakHyphen
);
m_oBcw
.
m_oStream
.
WriteBYTE
(
c_oSerRunType
::
noBreakHyphen
);
m_oBcw
.
m_oStream
.
WriteLONG
(
c_oSerPropLenType
::
Null
);
break
;
}
...
...
Common/DocxFormat/Source/DocxFormat/Logic/RunContent.h
View file @
0941203a
...
...
@@ -474,7 +474,7 @@ namespace OOX
}
virtual
CString
toXML
()
const
{
return
_T
(
"<w:no
n
BreakHyphen />"
);
return
_T
(
"<w:noBreakHyphen />"
);
}
virtual
EElementType
getType
()
const
...
...
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