Skip to content

O
onlyoffice_core
Commit c8558338 authored by ElenaSubbotina's avatar ElenaSubbotina Committed by Alexander Trofimov
Browse files
Options

x2t linux build 2.0.2.365

parent 45e75646
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
ASCOfficeOdfFile/src/odf/draw_frame_docx.cpp
View file @ c8558338
...@@ -940,7 +940,7 @@ void common_draw_docx_convert(oox::docx_conversion_context & Context, const unio ...@@ -940,7 +940,7 @@ void common_draw_docx_convert(oox::docx_conversion_context & Context, const unio
Context.get_drawing_context().set_size_child_group(drawing.cx + drawing.x, drawing.cy + drawing.y); Context.get_drawing_context().set_size_child_group(drawing.cx + drawing.x, drawing.cy + drawing.y);
// "" ... .. // "" ... ..
INT32 x_group_offset, y_group_offset; _INT32 x_group_offset, y_group_offset;
Context.get_drawing_context().get_position_group(x_group_offset, y_group_offset); Context.get_drawing_context().get_position_group(x_group_offset, y_group_offset);
drawing.x -= x_group_offset; drawing.x -= x_group_offset;
...@@ -1282,8 +1282,8 @@ void draw_g::docx_convert(oox::docx_conversion_context & Context) ...@@ -1282,8 +1282,8 @@ void draw_g::docx_convert(oox::docx_conversion_context & Context)
Context.get_drawing_context().set_position_child_group (drawing.x, drawing.y); Context.get_drawing_context().set_position_child_group (drawing.x, drawing.y);
Context.get_drawing_context().set_size_child_group (drawing.cx + drawing.x, drawing.cy + drawing.y); Context.get_drawing_context().set_size_child_group (drawing.cx + drawing.x, drawing.cy + drawing.y);
// "" ... .. // "" ... ..
INT32 x_group_offset, y_group_offset; _INT32 x_group_offset, y_group_offset;
Context.get_drawing_context().get_position_group(x_group_offset, y_group_offset); Context.get_drawing_context().get_position_group(x_group_offset, y_group_offset);
drawing.x -= x_group_offset; drawing.x -= x_group_offset;
......
X2tConverter/build/Qt/X2tConverter.pro
View file @ c8558338
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
QT -= core QT -= core
QT -= gui QT -= gui
VERSION = 2.0.2.364 VERSION = 2.0.2.365
DEFINES += INTVER=$$VERSION DEFINES += INTVER=$$VERSION
mac { mac {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7