Skip to content

C
core
Kaydet (Commit) 6bd6e195 authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

Use constants for ST_TblStyleOverrideType values 

Change-Id: I61a81bf1aab604d27441630dfb5d55f657211410
üst 358f5280
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 16 deletions
writerfilter/source/dmapper/TblStylePrHandler.cxx
Dosyayı görüntüle @ 6bd6e195
...@@ -79,9 +79,48 @@ void TblStylePrHandler::lcl_attribute(Id rName, Value & rVal) ...@@ -79,9 +79,48 @@ void TblStylePrHandler::lcl_attribute(Id rName, Value & rVal)
{ {
case NS_ooxml::LN_CT_TblStyleOverrideType: case NS_ooxml::LN_CT_TblStyleOverrideType:
{ {
// The tokenid should be the same in the model.xml than switch (rVal.getInt())
// in the TblStyleType enum {
m_nType = TblStyleType( rVal.getInt( ) ); case NS_ooxml::LN_Value_ST_TblStyleOverrideType_wholeTable:
m_nType = TBL_STYLE_WHOLETABLE;
break;
case NS_ooxml::LN_Value_ST_TblStyleOverrideType_firstRow:
m_nType = TBL_STYLE_FIRSTROW;
break;
case NS_ooxml::LN_Value_ST_TblStyleOverrideType_lastRow:
m_nType = TBL_STYLE_LASTROW;
break;
case NS_ooxml::LN_Value_ST_TblStyleOverrideType_firstCol:
m_nType = TBL_STYLE_FIRSTCOL;
break;
case NS_ooxml::LN_Value_ST_TblStyleOverrideType_lastCol:
m_nType = TBL_STYLE_LASTCOL;
break;
case NS_ooxml::LN_Value_ST_TblStyleOverrideType_band1Vert:
m_nType = TBL_STYLE_BAND1VERT;
break;
case NS_ooxml::LN_Value_ST_TblStyleOverrideType_band2Vert:
m_nType = TBL_STYLE_BAND2VERT;
break;
case NS_ooxml::LN_Value_ST_TblStyleOverrideType_band1Horz:
m_nType = TBL_STYLE_BAND1HORZ;
break;
case NS_ooxml::LN_Value_ST_TblStyleOverrideType_band2Horz:
m_nType = TBL_STYLE_BAND2HORZ;
break;
case NS_ooxml::LN_Value_ST_TblStyleOverrideType_neCell:
m_nType = TBL_STYLE_NECELL;
break;
case NS_ooxml::LN_Value_ST_TblStyleOverrideType_nwCell:
m_nType = TBL_STYLE_NWCELL;
break;
case NS_ooxml::LN_Value_ST_TblStyleOverrideType_seCell:
m_nType = TBL_STYLE_SECELL;
break;
case NS_ooxml::LN_Value_ST_TblStyleOverrideType_swCell:
m_nType = TBL_STYLE_SWCELL;
break;
}
} }
break; break;
} }
......
writerfilter/source/ooxml/model.xml
Dosyayı görüntüle @ 6bd6e195
...@@ -18734,19 +18734,19 @@ ...@@ -18734,19 +18734,19 @@
<element name="numIdMacAtCleanup" tokenid="ooxml:CT_Numbering_numIdMacAtCleanup"/> <element name="numIdMacAtCleanup" tokenid="ooxml:CT_Numbering_numIdMacAtCleanup"/>
</resource> </resource>
<resource name="ST_TblStyleOverrideType" resource="List"> <resource name="ST_TblStyleOverrideType" resource="List">
<value tokenid="1">wholeTable</value> <value tokenid="ooxml:Value_ST_TblStyleOverrideType_wholeTable">wholeTable</value>
<value tokenid="2">firstRow</value> <value tokenid="ooxml:Value_ST_TblStyleOverrideType_firstRow">firstRow</value>
<value tokenid="3">lastRow</value> <value tokenid="ooxml:Value_ST_TblStyleOverrideType_lastRow">lastRow</value>
<value tokenid="4">firstCol</value> <value tokenid="ooxml:Value_ST_TblStyleOverrideType_firstCol">firstCol</value>
<value tokenid="5">lastCol</value> <value tokenid="ooxml:Value_ST_TblStyleOverrideType_lastCol">lastCol</value>
<value tokenid="6">band1Vert</value> <value tokenid="ooxml:Value_ST_TblStyleOverrideType_band1Vert">band1Vert</value>
<value tokenid="7">band2Vert</value> <value tokenid="ooxml:Value_ST_TblStyleOverrideType_band2Vert">band2Vert</value>
<value tokenid="8">band1Horz</value> <value tokenid="ooxml:Value_ST_TblStyleOverrideType_band1Horz">band1Horz</value>
<value tokenid="9">band2Horz</value> <value tokenid="ooxml:Value_ST_TblStyleOverrideType_band2Horz">band2Horz</value>
<value tokenid="10">neCell</value> <value tokenid="ooxml:Value_ST_TblStyleOverrideType_neCell">neCell</value>
<value tokenid="11">nwCell</value> <value tokenid="ooxml:Value_ST_TblStyleOverrideType_nwCell">nwCell</value>
<value tokenid="12">seCell</value> <value tokenid="ooxml:Value_ST_TblStyleOverrideType_seCell">seCell</value>
<value tokenid="13">swCell</value> <value tokenid="ooxml:Value_ST_TblStyleOverrideType_swCell">swCell</value>
</resource> </resource>
<resource name="CT_Style_tblStylePr" resource="Properties"> <resource name="CT_Style_tblStylePr" resource="Properties">
<element name="pPr" tokenid="ooxml:CT_PPrBase"/> <element name="pPr" tokenid="ooxml:CT_PPrBase"/>
......
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