Commit d220cc8c authored by Sergey Konovalov's avatar Sergey Konovalov

removed stubs on writing tblLayout

parent fa98f22e
...@@ -2340,7 +2340,7 @@ public: ...@@ -2340,7 +2340,7 @@ public:
{ {
return Jc.empty() && TableInd.empty() && TableW.empty() && TableCellMar.empty() && TableBorders.empty() && Shd.empty() && tblpPr.empty()&& Style.empty() && Look.empty() && tblPrChange.empty() && TableCellSpacing.empty() && RowBandSize.empty() && ColBandSize.empty(); return Jc.empty() && TableInd.empty() && TableW.empty() && TableCellMar.empty() && TableBorders.empty() && Shd.empty() && tblpPr.empty()&& Style.empty() && Look.empty() && tblPrChange.empty() && TableCellSpacing.empty() && RowBandSize.empty() && ColBandSize.empty();
} }
std::wstring Write(bool bBandSize, bool bLayout) std::wstring Write()
{ {
std::wstring sRes; std::wstring sRes;
sRes += L"<w:tblPr>"; sRes += L"<w:tblPr>";
...@@ -2364,13 +2364,8 @@ public: ...@@ -2364,13 +2364,8 @@ public:
sRes += (TableBorders); sRes += (TableBorders);
if(false == Shd.empty()) if(false == Shd.empty())
sRes += (Shd); sRes += (Shd);
if(bLayout) if(false == Layout.empty())
{ sRes += (Layout);
if(false == Layout.empty())
sRes += (Layout);
else if(g_nCurFormatVersion < 4)
sRes += L"<w:tblLayout w:type=\"fixed\"/>";
}
if(false == TableCellMar.empty()) if(false == TableCellMar.empty())
sRes += (TableCellMar); sRes += (TableCellMar);
if(false == Look.empty()) if(false == Look.empty())
...@@ -2758,7 +2753,7 @@ public: ...@@ -2758,7 +2753,7 @@ public:
} }
if(NULL != tblPr) if(NULL != tblPr)
{ {
pCStringWriter->WriteString(tblPr->Write(false, true)); pCStringWriter->WriteString(tblPr->Write());
} }
if(NULL != tblGridChange) if(NULL != tblGridChange)
{ {
......
...@@ -2826,7 +2826,7 @@ public: ...@@ -2826,7 +2826,7 @@ public:
{ {
CWiterTblPr oWiterTblPr; CWiterTblPr oWiterTblPr;
oBinary_tblPrReader.Read_tblPrOut(length, &oWiterTblPr); oBinary_tblPrReader.Read_tblPrOut(length, &oWiterTblPr);
odocStyle->TablePr = oWiterTblPr.Write(true, false); odocStyle->TablePr = oWiterTblPr.Write();
} }
else if(c_oSer_sts::Style_RowPr == type) else if(c_oSer_sts::Style_RowPr == type)
{ {
...@@ -2922,7 +2922,7 @@ public: ...@@ -2922,7 +2922,7 @@ public:
oBinary_tblPrReader.Read_tblPrOut(length, &oWiterTblPr); oBinary_tblPrReader.Read_tblPrOut(length, &oWiterTblPr);
if(false == oWiterTblPr.IsEmpty()) if(false == oWiterTblPr.IsEmpty())
ptblStylePr->Writer.WriteString(oWiterTblPr.Write(false, false)); ptblStylePr->Writer.WriteString(oWiterTblPr.Write());
} }
else if(c_oSerProp_tblStylePrType::TrPr == type) else if(c_oSerProp_tblStylePrType::TrPr == type)
{ {
...@@ -6851,7 +6851,7 @@ public: ...@@ -6851,7 +6851,7 @@ public:
{ {
CWiterTblPr oWiterTblPr; CWiterTblPr oWiterTblPr;
oBinary_tblPrReader.Read_tblPrOut(length, &oWiterTblPr); oBinary_tblPrReader.Read_tblPrOut(length, &oWiterTblPr);
pCStringWriter->WriteString(oWiterTblPr.Write(false, true)); pCStringWriter->WriteString(oWiterTblPr.Write());
} }
else if( c_oSerDocTableType::tblGrid == type ) else if( c_oSerDocTableType::tblGrid == type )
{ {
......
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