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
435a11d7
Commit
435a11d7
authored
Apr 27, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
9a5329f5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
1 deletion
+16
-1
ASCOfficeOdfFileW/source/OdfFormat/odt_conversion_context.cpp
...fficeOdfFileW/source/OdfFormat/odt_conversion_context.cpp
+5
-0
ASCOfficeOdfFileW/source/OdfFormat/odt_conversion_context.h
ASCOfficeOdfFileW/source/OdfFormat/odt_conversion_context.h
+1
-0
ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp
ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp
+9
-0
ASCOfficeOdfFileW/source/win32/Oox2OdfConverter.vcproj
ASCOfficeOdfFileW/source/win32/Oox2OdfConverter.vcproj
+1
-1
No files found.
ASCOfficeOdfFileW/source/OdfFormat/odt_conversion_context.cpp
View file @
435a11d7
...
@@ -163,6 +163,11 @@ odf_table_context* odt_conversion_context::table_context()
...
@@ -163,6 +163,11 @@ odf_table_context* odt_conversion_context::table_context()
{
{
return
&
table_context_
;
return
&
table_context_
;
}
}
odf_notes_context
*
odt_conversion_context
::
notes_context
()
{
return
&
notes_context_
;
}
odf_text_context
*
odt_conversion_context
::
text_context
()
odf_text_context
*
odt_conversion_context
::
text_context
()
{
{
...
...
ASCOfficeOdfFileW/source/OdfFormat/odt_conversion_context.h
View file @
435a11d7
...
@@ -79,6 +79,7 @@ public:
...
@@ -79,6 +79,7 @@ public:
odf_comment_context
*
comment_context
();
odf_comment_context
*
comment_context
();
odf_table_context
*
table_context
();
odf_table_context
*
table_context
();
odf_notes_context
*
notes_context
();
void
start_drawings
();
void
start_drawings
();
void
end_drawings
();
void
end_drawings
();
...
...
ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp
View file @
435a11d7
...
@@ -1293,6 +1293,15 @@ void DocxConverter::convert(OOX::Logic::CParagraphProperty *oox_paragraph_pr, cp
...
@@ -1293,6 +1293,15 @@ void DocxConverter::convert(OOX::Logic::CParagraphProperty *oox_paragraph_pr, cp
}
}
if
(
odt_context
->
notes_context
()
->
is_started
())
{
paragraph_properties
->
content_
.
fo_margin_left_
=
odf_types
::
length
(
0.5
,
odf_types
::
length
::
cm
);
paragraph_properties
->
content_
.
fo_text_indent_
=
odf_types
::
length
(
-
0.5
,
odf_types
::
length
::
cm
);
paragraph_properties
->
content_
.
fo_line_height_
=
odf_types
::
percent
(
100.
);
paragraph_properties
->
content_
.
style_auto_text_indent_
=
false
;
//loext:contextual-spacing="false"
}
if
(
oox_paragraph_pr
->
m_oTabs
.
IsInit
())
if
(
oox_paragraph_pr
->
m_oTabs
.
IsInit
())
{
{
paragraph_properties
->
add_child_element
(
odf_context
()
->
start_tabs
());
paragraph_properties
->
add_child_element
(
odf_context
()
->
start_tabs
());
...
...
ASCOfficeOdfFileW/source/win32/Oox2OdfConverter.vcproj
View file @
435a11d7
<?xml version="1.0" encoding="windows-1251"?>
<?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject
<VisualStudioProject
ProjectType=
"Visual C++"
ProjectType=
"Visual C++"
Version=
"8
.
00"
Version=
"8
,
00"
Name=
"Oox2OdfConverter"
Name=
"Oox2OdfConverter"
ProjectGUID=
"{BEE01B53-244A-44E6-8947-ED9342D9247E}"
ProjectGUID=
"{BEE01B53-244A-44E6-8947-ED9342D9247E}"
RootNamespace=
"Oox2OdfConverter"
RootNamespace=
"Oox2OdfConverter"
...
...
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