pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

ASCOfficeOdfFileW.dll (1.2.0.172)

Browse Source 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58994 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Elen.Subbotina
2014-10-17 12:21:21 +00:00
committed by Alexander Trofimov
parent 91e4ebc4e1
commit 5069471b55
4 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ASCOfficeOdfFileW/ASCOfficeOdfFileW.sln
View File

@ -8,8 +8,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormat", "source\OdfForm
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Oox2OdfConverter", "source\Oox2OdfConverter.vcproj", "{BEE01B53-244A-44E6-8947-ED9342D9247E}"
ProjectSection(ProjectDependencies) = postProject
{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
{E5A67556-44DA-4481-8F87-0A3AEDBD20DD} = {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}
{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdfFileWTest", "ASCOfficeOdfFileWTest\ASCOfficeOdfFileWTest.vcproj", "{FBA8446A-150F-4A10-B4DA-1022048D6473}"
@ -20,6 +20,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\Common\Doc
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdfFileW", "ASCOfficeOdfFileW.vcproj", "{6258296E-ABCE-4BC6-9F4A-8522CD615603}"
ProjectSection(ProjectDependencies) = postProject
{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
{BEE01B53-244A-44E6-8947-ED9342D9247E} = {BEE01B53-244A-44E6-8947-ED9342D9247E}
EndProjectSection
EndProject

2
ASCOfficeOdfFileW/ASCOfficeOdfFileW.vcproj
View File

@ -204,7 +204,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;../Redist&quot;"
CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;../Redist&quot;&#x0D;&#x0A;"
/>
</Configuration>
</Configurations>

25
ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp
View File

@ -3203,8 +3203,9 @@ void DocxConverter::convert(OOX::Logic::CTbl *oox_table)
//if (in_list, but not in paragraph)
odt_context->set_no_list();
bool styled_table = false;
bool in_frame = false;
bool styled_table = false;
bool in_frame = false;
int in_frame_anchor = odf::anchor_type::Paragraph;
if (oox_table->m_oTableProperties && (oox_table->m_oTableProperties->m_oTblStyle.IsInit() && oox_table->m_oTableProperties->m_oTblStyle->m_sVal.IsInit()))
{//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
@ -3227,11 +3228,12 @@ void DocxConverter::convert(OOX::Logic::CTbl *oox_table)
}
if (oox_table->m_oTableProperties->m_oTblpPr->m_oTblpY.IsInit())
{
in_frame = true;
if (oox_table->m_oTableProperties->m_oTblpPr->m_oVertAnchor.IsInit() &&
oox_table->m_oTableProperties->m_oTblpPr->m_oVertAnchor->GetValue() == SimpleTypes::vanchorText)
in_frame = false;
else
in_frame = true;
{
//in_frame_anchor = odf::anchor_type::Char;
}
}
}
@ -3254,7 +3256,7 @@ void DocxConverter::convert(OOX::Logic::CTbl *oox_table)
odt_context->drawing_context()->set_drawings_rect(x, y, width, height);
odt_context->drawing_context()->set_anchor(odf::anchor_type::Paragraph);
odt_context->drawing_context()->set_anchor(in_frame_anchor);
odt_context->drawing_context()->set_wrap_style(odf::style_wrap::Dynamic);
if (oox_table->m_oTableProperties->m_oTblpPr->m_oVertAnchor.IsInit())
@ -3276,15 +3278,22 @@ void DocxConverter::convert(OOX::Logic::CTbl *oox_table)
if (oox_table->m_oTableProperties->m_oTblpPr->m_oRightFromText.IsInit())
{
odt_context->drawing_context()->set_horizontal_pos(oox_table->m_oTableProperties->m_oTblpPr->m_oRightFromText->ToPoints());
if (!x) //x = *x + oox_table->m_oTableProperties->m_oTblpPr->m_oRightFromText->ToPoints();
x = oox_table->m_oTableProperties->m_oTblpPr->m_oRightFromText->ToPoints();
odt_context->drawing_context()->set_horizontal_pos(*x);
}
if (oox_table->m_oTableProperties->m_oTblpPr->m_oTopFromText.IsInit())
{
odt_context->drawing_context()->set_vertical_pos(oox_table->m_oTableProperties->m_oTblpPr->m_oTopFromText->ToPoints());
if (!y) //y = *y + oox_table->m_oTableProperties->m_oTblpPr->m_oTopFromText->ToPoints();
y = oox_table->m_oTableProperties->m_oTblpPr->m_oTopFromText->ToPoints();
odt_context->drawing_context()->set_vertical_pos(*y);
}
odt_context->drawing_context()->start_drawing();
odt_context->drawing_context()->start_text_box();
odt_context->drawing_context()->set_text_box_min_size(0, 1.);
odt_context->drawing_context()->set_z_order(0x7fffffff-1);
odt_context->drawing_context()->set_text_box_parent_style(L"Frame");
odt_context->drawing_context()->set_name(L"TableFrame");

6
ASCOfficeOdfFileW/version.h
View File

@ -2,6 +2,6 @@
//1
//2
//0
//167
#define INTVER 1,2,0,167
#define STRVER "1,2,0,167\0"
//172
#define INTVER 1,2,0,172
#define STRVER "1,2,0,172\0"