diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2019-05-17 21:44:07 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-05-20 10:06:55 +0200 |
commit | 6090dcbdc64e8d950121aad62802d4bf056a70ec (patch) | |
tree | 79cfec6ddd5e127ffca3365bc18c622da5364998 /writerfilter | |
parent | 174e2de4568afa7e3805b8b679d259491633723d (diff) |
writerfilter: make RTFParserState members private, part 7
Change-Id: I8740a47e86b66a0792b34c8cb5078310afe46bfa
Reviewed-on: https://gerrit.libreoffice.org/72560
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/rtftok/rtfdispatchdestination.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdispatchflag.cxx | 67 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdispatchsymbol.cxx | 22 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdispatchvalue.cxx | 151 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 52 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.hxx | 19 |
6 files changed, 172 insertions, 141 deletions
diff --git a/writerfilter/source/rtftok/rtfdispatchdestination.cxx b/writerfilter/source/rtftok/rtfdispatchdestination.cxx index 5e8e46a0ebfe..a38cfd202363 100644 --- a/writerfilter/source/rtftok/rtfdispatchdestination.cxx +++ b/writerfilter/source/rtftok/rtfdispatchdestination.cxx @@ -183,7 +183,7 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) break; case RTF_NESTTABLEPROPS: // do not set any properties of outer table at nested table! - m_aStates.top().aTableCellSprms = m_aDefaultState.aTableCellSprms; + m_aStates.top().getTableCellSprms() = m_aDefaultState.getTableCellSprms(); m_aStates.top().getTableCellAttributes() = m_aDefaultState.getTableCellAttributes(); m_aNestedTableCellsSprms.clear(); m_aNestedTableCellsAttributes.clear(); diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx b/writerfilter/source/rtftok/rtfdispatchflag.cxx index d554f312d8d7..76fe64743527 100644 --- a/writerfilter/source/rtftok/rtfdispatchflag.cxx +++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx @@ -268,7 +268,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) m_nResetBreakOnSectBreak = nKeyword; } auto pValue = new RTFValue(nParam); - m_aStates.top().aSectionSprms.set(NS_ooxml::LN_EG_SectPrContents_type, pValue); + m_aStates.top().getSectionSprms().set(NS_ooxml::LN_EG_SectPrContents_type, pValue); return RTFError::OK; } @@ -376,7 +376,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) if (nParam >= 0) { auto pValue = new RTFValue(nParam); - m_aStates.top().aTableRowSprms.set(NS_ooxml::LN_CT_TrPrBase_jc, pValue); + m_aStates.top().getTableRowSprms().set(NS_ooxml::LN_CT_TrPrBase_jc, pValue); return RTFError::OK; } @@ -404,7 +404,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) if (nParam >= 0) { auto pValue = new RTFValue(nParam); - m_aStates.top().aTableCellSprms.set(NS_ooxml::LN_CT_TcPrBase_textDirection, pValue); + m_aStates.top().getTableCellSprms().set(NS_ooxml::LN_CT_TcPrBase_textDirection, pValue); } // Trivial paragraph flags @@ -527,8 +527,8 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) } case RTF_SECTD: { - m_aStates.top().aSectionSprms = m_aDefaultState.aSectionSprms; - m_aStates.top().aSectionAttributes = m_aDefaultState.aSectionAttributes; + m_aStates.top().getSectionSprms() = m_aDefaultState.getSectionSprms(); + m_aStates.top().getSectionAttributes() = m_aDefaultState.getSectionAttributes(); } break; case RTF_TROWD: @@ -574,8 +574,8 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) break; case RTF_LTRROW: case RTF_RTLROW: - m_aStates.top().aTableRowSprms.set(NS_ooxml::LN_CT_TblPrBase_bidiVisual, - new RTFValue(int(nKeyword == RTF_RTLROW))); + m_aStates.top().getTableRowSprms().set(NS_ooxml::LN_CT_TblPrBase_bidiVisual, + new RTFValue(int(nKeyword == RTF_RTLROW))); break; case RTF_LTRCH: // dmapper does not support this. @@ -621,7 +621,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) default: break; } - putNestedSprm(m_aStates.top().aTableCellSprms, NS_ooxml::LN_CT_TcPrBase_tcBorders, + putNestedSprm(m_aStates.top().getTableCellSprms(), NS_ooxml::LN_CT_TcPrBase_tcBorders, nParam, pValue); m_aStates.top().nBorderState = RTFBorderState::CELL; } @@ -651,8 +651,8 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) default: break; } - putNestedSprm(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgBorders, - nParam, pValue); + putNestedSprm(m_aStates.top().getSectionSprms(), + NS_ooxml::LN_EG_SectPrContents_pgBorders, nParam, pValue); m_aStates.top().nBorderState = RTFBorderState::PAGE; } break; @@ -697,25 +697,25 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) case RTF_CLMGF: { auto pValue = new RTFValue(NS_ooxml::LN_Value_ST_Merge_restart); - m_aStates.top().aTableCellSprms.set(NS_ooxml::LN_CT_TcPrBase_hMerge, pValue); + m_aStates.top().getTableCellSprms().set(NS_ooxml::LN_CT_TcPrBase_hMerge, pValue); } break; case RTF_CLMRG: { auto pValue = new RTFValue(NS_ooxml::LN_Value_ST_Merge_continue); - m_aStates.top().aTableCellSprms.set(NS_ooxml::LN_CT_TcPrBase_hMerge, pValue); + m_aStates.top().getTableCellSprms().set(NS_ooxml::LN_CT_TcPrBase_hMerge, pValue); } break; case RTF_CLVMGF: { auto pValue = new RTFValue(NS_ooxml::LN_Value_ST_Merge_restart); - m_aStates.top().aTableCellSprms.set(NS_ooxml::LN_CT_TcPrBase_vMerge, pValue); + m_aStates.top().getTableCellSprms().set(NS_ooxml::LN_CT_TcPrBase_vMerge, pValue); } break; case RTF_CLVMRG: { auto pValue = new RTFValue(NS_ooxml::LN_Value_ST_Merge_continue); - m_aStates.top().aTableCellSprms.set(NS_ooxml::LN_CT_TcPrBase_vMerge, pValue); + m_aStates.top().getTableCellSprms().set(NS_ooxml::LN_CT_TcPrBase_vMerge, pValue); } break; case RTF_CLVERTALT: @@ -737,19 +737,19 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) break; } auto pValue = new RTFValue(nParam); - m_aStates.top().aTableCellSprms.set(NS_ooxml::LN_CT_TcPrBase_vAlign, pValue); + m_aStates.top().getTableCellSprms().set(NS_ooxml::LN_CT_TcPrBase_vAlign, pValue); } break; case RTF_TRKEEP: { auto pValue = new RTFValue(1); - m_aStates.top().aTableRowSprms.set(NS_ooxml::LN_CT_TrPrBase_cantSplit, pValue); + m_aStates.top().getTableRowSprms().set(NS_ooxml::LN_CT_TrPrBase_cantSplit, pValue); } break; case RTF_SECTUNLOCKED: { auto pValue = new RTFValue(0); - m_aStates.top().aSectionSprms.set(NS_ooxml::LN_EG_SectPrContents_formProt, pValue); + m_aStates.top().getSectionSprms().set(NS_ooxml::LN_EG_SectPrContents_formProt, pValue); } break; case RTF_PGNBIDIA: @@ -768,7 +768,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) case RTF_TITLEPG: { auto pValue = new RTFValue(1); - m_aStates.top().aSectionSprms.set(NS_ooxml::LN_EG_SectPrContents_titlePg, pValue); + m_aStates.top().getSectionSprms().set(NS_ooxml::LN_EG_SectPrContents_titlePg, pValue); } break; case RTF_SUPER: @@ -810,7 +810,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) auto pValue = new RTFValue(nKeyword == RTF_LINEPPAGE ? NS_ooxml::LN_Value_ST_LineNumberRestart_newPage : NS_ooxml::LN_Value_ST_LineNumberRestart_continuous); - putNestedAttribute(m_aStates.top().aSectionSprms, + putNestedAttribute(m_aStates.top().getSectionSprms(), NS_ooxml::LN_EG_SectPrContents_lnNumType, NS_ooxml::LN_CT_LineNumber_restart, pValue); } @@ -839,7 +839,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) } break; case RTF_NOLINE: - eraseNestedAttribute(m_aStates.top().aSectionSprms, + eraseNestedAttribute(m_aStates.top().getSectionSprms(), NS_ooxml::LN_EG_SectPrContents_lnNumType, NS_ooxml::LN_CT_LineNumber_distance); break; @@ -1095,15 +1095,17 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) case RTF_LANDSCAPE: { auto pValue = new RTFValue(NS_ooxml::LN_Value_ST_PageOrientation_landscape); - putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgSz, - NS_ooxml::LN_CT_PageSz_orient, pValue); + putNestedAttribute(m_aDefaultState.getSectionSprms(), + NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_orient, + pValue); [[fallthrough]]; // set the default + current value } case RTF_LNDSCPSXN: { auto pValue = new RTFValue(NS_ooxml::LN_Value_ST_PageOrientation_landscape); - putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgSz, - NS_ooxml::LN_CT_PageSz_orient, pValue); + putNestedAttribute(m_aStates.top().getSectionSprms(), + NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_orient, + pValue); } break; case RTF_SHPBXPAGE: @@ -1151,18 +1153,19 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) m_aSettingsTableSprms.set(NS_ooxml::LN_CT_Settings_widowControl, new RTFValue(1)); break; case RTF_LINEBETCOL: - putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_cols, - NS_ooxml::LN_CT_Columns_sep, new RTFValue(1)); + putNestedAttribute(m_aStates.top().getSectionSprms(), + NS_ooxml::LN_EG_SectPrContents_cols, NS_ooxml::LN_CT_Columns_sep, + new RTFValue(1)); break; case RTF_PGNRESTART: - putNestedAttribute(m_aStates.top().aSectionSprms, + putNestedAttribute(m_aStates.top().getSectionSprms(), NS_ooxml::LN_EG_SectPrContents_pgNumType, NS_ooxml::LN_CT_PageNumber_start, new RTFValue(1)); break; case RTF_PGNUCLTR: { auto pIntValue = new RTFValue(NS_ooxml::LN_Value_ST_NumberFormat_upperLetter); - putNestedAttribute(m_aStates.top().aSectionSprms, + putNestedAttribute(m_aStates.top().getSectionSprms(), NS_ooxml::LN_EG_SectPrContents_pgNumType, NS_ooxml::LN_CT_PageNumber_fmt, pIntValue); } @@ -1170,7 +1173,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) case RTF_PGNLCLTR: { auto pIntValue = new RTFValue(NS_ooxml::LN_Value_ST_NumberFormat_lowerLetter); - putNestedAttribute(m_aStates.top().aSectionSprms, + putNestedAttribute(m_aStates.top().getSectionSprms(), NS_ooxml::LN_EG_SectPrContents_pgNumType, NS_ooxml::LN_CT_PageNumber_fmt, pIntValue); } @@ -1178,7 +1181,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) case RTF_PGNUCRM: { auto pIntValue = new RTFValue(NS_ooxml::LN_Value_ST_NumberFormat_upperRoman); - putNestedAttribute(m_aStates.top().aSectionSprms, + putNestedAttribute(m_aStates.top().getSectionSprms(), NS_ooxml::LN_EG_SectPrContents_pgNumType, NS_ooxml::LN_CT_PageNumber_fmt, pIntValue); } @@ -1186,7 +1189,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) case RTF_PGNLCRM: { auto pIntValue = new RTFValue(NS_ooxml::LN_Value_ST_NumberFormat_lowerRoman); - putNestedAttribute(m_aStates.top().aSectionSprms, + putNestedAttribute(m_aStates.top().getSectionSprms(), NS_ooxml::LN_EG_SectPrContents_pgNumType, NS_ooxml::LN_CT_PageNumber_fmt, pIntValue); } @@ -1194,7 +1197,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) case RTF_PGNDEC: { auto pIntValue = new RTFValue(NS_ooxml::LN_Value_ST_NumberFormat_decimal); - putNestedAttribute(m_aStates.top().aSectionSprms, + putNestedAttribute(m_aStates.top().getSectionSprms(), NS_ooxml::LN_EG_SectPrContents_pgNumType, NS_ooxml::LN_CT_PageNumber_fmt, pIntValue); } diff --git a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx index 86b9c84485d3..5faa9a831fde 100644 --- a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx +++ b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx @@ -237,8 +237,8 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) // Add fake cellx / cell, RTF equivalent of // OOXMLFastContextHandlerTextTableRow::handleGridAfter(). auto pXValue = new RTFValue(m_aStates.top().getTableRowWidthAfter()); - m_aStates.top().aTableRowSprms.set(NS_ooxml::LN_CT_TblGridBase_gridCol, pXValue, - RTFOverwrite::NO_APPEND); + m_aStates.top().getTableRowSprms().set(NS_ooxml::LN_CT_TblGridBase_gridCol, pXValue, + RTFOverwrite::NO_APPEND); dispatchSymbol(RTF_CELL); // Adjust total width, which is done in the \cellx handler for normal cells. @@ -260,13 +260,13 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) const int MINLAY = 23; // sw/inc/swtypes.hxx, minimal possible size of frames. if ((m_nCellxMax - m_nTopLevelCurrentCellX) >= MINLAY) { - auto pXValueLast = m_aStates.top().aTableRowSprms.find( + auto pXValueLast = m_aStates.top().getTableRowSprms().find( NS_ooxml::LN_CT_TblGridBase_gridCol, false); const int nXValueLast = pXValueLast ? pXValueLast->getInt() : 0; auto pXValue = new RTFValue(nXValueLast + m_nCellxMax - m_nTopLevelCurrentCellX); - m_aStates.top().aTableRowSprms.eraseLast(NS_ooxml::LN_CT_TblGridBase_gridCol); - m_aStates.top().aTableRowSprms.set(NS_ooxml::LN_CT_TblGridBase_gridCol, pXValue, - RTFOverwrite::NO_APPEND); + m_aStates.top().getTableRowSprms().eraseLast(NS_ooxml::LN_CT_TblGridBase_gridCol); + m_aStates.top().getTableRowSprms().set(NS_ooxml::LN_CT_TblGridBase_gridCol, pXValue, + RTFOverwrite::NO_APPEND); m_nTopLevelCurrentCellX = m_nCellxMax; } @@ -303,8 +303,8 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) m_aTopLevelTableCellsAttributes, m_nTopLevelCells); // The scope of the table cell defaults is one row. - m_aDefaultState.aTableCellSprms.clear(); - m_aStates.top().aTableCellSprms = m_aDefaultState.aTableCellSprms; + m_aDefaultState.getTableCellSprms().clear(); + m_aStates.top().getTableCellSprms() = m_aDefaultState.getTableCellSprms(); m_aStates.top().getTableCellAttributes() = m_aDefaultState.getTableCellAttributes(); writerfilter::Reference<Properties>::Pointer_t paraProperties; @@ -329,7 +329,7 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) { bool bColumns = false; // If we have multiple columns RTFValue::Pointer_t pCols - = m_aStates.top().aSectionSprms.find(NS_ooxml::LN_EG_SectPrContents_cols); + = m_aStates.top().getSectionSprms().find(NS_ooxml::LN_EG_SectPrContents_cols); if (pCols) { RTFValue::Pointer_t pNum = pCols->getAttributes().find(NS_ooxml::LN_CT_Columns_num); @@ -363,10 +363,10 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) // If we're inside a continuous section, we should send a section break, not a page one. RTFValue::Pointer_t pBreak - = m_aStates.top().aSectionSprms.find(NS_ooxml::LN_EG_SectPrContents_type); + = m_aStates.top().getSectionSprms().find(NS_ooxml::LN_EG_SectPrContents_type); // Unless we're on a title page. RTFValue::Pointer_t pTitlePg - = m_aStates.top().aSectionSprms.find(NS_ooxml::LN_EG_SectPrContents_titlePg); + = m_aStates.top().getSectionSprms().find(NS_ooxml::LN_EG_SectPrContents_titlePg); if (((pBreak.get() && pBreak->getInt() == static_cast<sal_Int32>(NS_ooxml::LN_Value_ST_SectionMark_continuous)) diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx index f2a27759c50c..7ad595168ce2 100644 --- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx +++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx @@ -520,7 +520,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) case RTF_CLCBPATRAW: { auto pValue = new RTFValue(sal_uInt32(getColorTable(nParam))); - putNestedAttribute(m_aStates.top().aTableCellSprms, NS_ooxml::LN_CT_TcPrBase_shd, + putNestedAttribute(m_aStates.top().getTableCellSprms(), NS_ooxml::LN_CT_TcPrBase_shd, NS_ooxml::LN_CT_Shd_fill, pValue); } break; @@ -856,7 +856,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) // If there is a negative left margin, then the first cellx is relative to that. RTFValue::Pointer_t pTblInd - = m_aStates.top().aTableRowSprms.find(NS_ooxml::LN_CT_TblPrBase_tblInd); + = m_aStates.top().getTableRowSprms().find(NS_ooxml::LN_CT_TblPrBase_tblInd); if (rCurrentCellX == 0 && pTblInd.get()) { RTFValue::Pointer_t pWidth @@ -867,24 +867,24 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) rCurrentCellX = nParam; auto pXValue = new RTFValue(nCellX); - m_aStates.top().aTableRowSprms.set(NS_ooxml::LN_CT_TblGridBase_gridCol, pXValue, - RTFOverwrite::NO_APPEND); + m_aStates.top().getTableRowSprms().set(NS_ooxml::LN_CT_TblGridBase_gridCol, pXValue, + RTFOverwrite::NO_APPEND); if (Destination::NESTEDTABLEPROPERTIES == m_aStates.top().eDestination) { m_nNestedCells++; // Push cell properties. - m_aNestedTableCellsSprms.push_back(m_aStates.top().aTableCellSprms); + m_aNestedTableCellsSprms.push_back(m_aStates.top().getTableCellSprms()); m_aNestedTableCellsAttributes.push_back(m_aStates.top().getTableCellAttributes()); } else { m_nTopLevelCells++; // Push cell properties. - m_aTopLevelTableCellsSprms.push_back(m_aStates.top().aTableCellSprms); + m_aTopLevelTableCellsSprms.push_back(m_aStates.top().getTableCellSprms()); m_aTopLevelTableCellsAttributes.push_back(m_aStates.top().getTableCellAttributes()); } - m_aStates.top().aTableCellSprms = m_aDefaultState.aTableCellSprms; + m_aStates.top().getTableCellSprms() = m_aDefaultState.getTableCellSprms(); m_aStates.top().getTableCellAttributes() = m_aDefaultState.getTableCellAttributes(); // We assume text after a row definition always belongs to the table, to handle text before the real INTBL token dispatchFlag(RTF_INTBL); @@ -914,21 +914,23 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) else if (nParam > 0) hRule = "atLeast"; - putNestedAttribute(m_aStates.top().aTableRowSprms, NS_ooxml::LN_CT_TrPrBase_trHeight, - NS_ooxml::LN_CT_Height_val, pIntValue); + putNestedAttribute(m_aStates.top().getTableRowSprms(), + NS_ooxml::LN_CT_TrPrBase_trHeight, NS_ooxml::LN_CT_Height_val, + pIntValue); auto pHRule = new RTFValue(hRule); - putNestedAttribute(m_aStates.top().aTableRowSprms, NS_ooxml::LN_CT_TrPrBase_trHeight, - NS_ooxml::LN_CT_Height_hRule, pHRule); + putNestedAttribute(m_aStates.top().getTableRowSprms(), + NS_ooxml::LN_CT_TrPrBase_trHeight, NS_ooxml::LN_CT_Height_hRule, + pHRule); } break; case RTF_TRLEFT: { // the value is in twips - putNestedAttribute(m_aStates.top().aTableRowSprms, NS_ooxml::LN_CT_TblPrBase_tblInd, + putNestedAttribute(m_aStates.top().getTableRowSprms(), NS_ooxml::LN_CT_TblPrBase_tblInd, NS_ooxml::LN_CT_TblWidth_type, new RTFValue(NS_ooxml::LN_Value_ST_TblWidth_dxa)); - putNestedAttribute(m_aStates.top().aTableRowSprms, NS_ooxml::LN_CT_TblPrBase_tblInd, + putNestedAttribute(m_aStates.top().getTableRowSprms(), NS_ooxml::LN_CT_TblPrBase_tblInd, NS_ooxml::LN_CT_TblWidth_w, new RTFValue(nParam)); auto const aDestination = m_aStates.top().eDestination; int& rCurrentTRLeft((Destination::NESTEDTABLEPROPERTIES == aDestination) @@ -941,21 +943,23 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) } break; case RTF_COLS: - putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_cols, - NS_ooxml::LN_CT_Columns_num, pIntValue); + putNestedAttribute(m_aStates.top().getSectionSprms(), + NS_ooxml::LN_EG_SectPrContents_cols, NS_ooxml::LN_CT_Columns_num, + pIntValue); break; case RTF_COLSX: - putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_cols, - NS_ooxml::LN_CT_Columns_space, pIntValue); + putNestedAttribute(m_aStates.top().getSectionSprms(), + NS_ooxml::LN_EG_SectPrContents_cols, NS_ooxml::LN_CT_Columns_space, + pIntValue); break; case RTF_COLNO: - putNestedSprm(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_cols, + putNestedSprm(m_aStates.top().getSectionSprms(), NS_ooxml::LN_EG_SectPrContents_cols, NS_ooxml::LN_CT_Columns_col, pIntValue); break; case RTF_COLW: case RTF_COLSR: { - RTFSprms& rAttributes = getLastAttributes(m_aStates.top().aSectionSprms, + RTFSprms& rAttributes = getLastAttributes(m_aStates.top().getSectionSprms(), NS_ooxml::LN_EG_SectPrContents_cols); rAttributes.set( (nKeyword == RTF_COLW ? NS_ooxml::LN_CT_Column_w : NS_ooxml::LN_CT_Column_space), @@ -963,72 +967,86 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) } break; case RTF_PAPERH: - putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgSz, - NS_ooxml::LN_CT_PageSz_h, pIntValue); + putNestedAttribute(m_aDefaultState.getSectionSprms(), + NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_h, + pIntValue); [[fallthrough]]; // set the default + current value case RTF_PGHSXN: - putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgSz, - NS_ooxml::LN_CT_PageSz_h, pIntValue); + putNestedAttribute(m_aStates.top().getSectionSprms(), + NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_h, + pIntValue); break; case RTF_PAPERW: - putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgSz, - NS_ooxml::LN_CT_PageSz_w, pIntValue); + putNestedAttribute(m_aDefaultState.getSectionSprms(), + NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_w, + pIntValue); [[fallthrough]]; // set the default + current value case RTF_PGWSXN: - putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgSz, - NS_ooxml::LN_CT_PageSz_w, pIntValue); + putNestedAttribute(m_aStates.top().getSectionSprms(), + NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_w, + pIntValue); break; case RTF_MARGL: - putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, - NS_ooxml::LN_CT_PageMar_left, pIntValue); + putNestedAttribute(m_aDefaultState.getSectionSprms(), + NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_left, + pIntValue); [[fallthrough]]; // set the default + current value case RTF_MARGLSXN: - putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, - NS_ooxml::LN_CT_PageMar_left, pIntValue); + putNestedAttribute(m_aStates.top().getSectionSprms(), + NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_left, + pIntValue); break; case RTF_MARGR: - putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, - NS_ooxml::LN_CT_PageMar_right, pIntValue); + putNestedAttribute(m_aDefaultState.getSectionSprms(), + NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_right, + pIntValue); [[fallthrough]]; // set the default + current value case RTF_MARGRSXN: - putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, - NS_ooxml::LN_CT_PageMar_right, pIntValue); + putNestedAttribute(m_aStates.top().getSectionSprms(), + NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_right, + pIntValue); break; case RTF_MARGT: - putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, - NS_ooxml::LN_CT_PageMar_top, pIntValue); + putNestedAttribute(m_aDefaultState.getSectionSprms(), + NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_top, + pIntValue); [[fallthrough]]; // set the default + current value case RTF_MARGTSXN: - putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, - NS_ooxml::LN_CT_PageMar_top, pIntValue); + putNestedAttribute(m_aStates.top().getSectionSprms(), + NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_top, + pIntValue); break; case RTF_MARGB: - putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, - NS_ooxml::LN_CT_PageMar_bottom, pIntValue); + putNestedAttribute(m_aDefaultState.getSectionSprms(), + NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_bottom, + pIntValue); [[fallthrough]]; // set the default + current value case RTF_MARGBSXN: - putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, - NS_ooxml::LN_CT_PageMar_bottom, pIntValue); + putNestedAttribute(m_aStates.top().getSectionSprms(), + NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_bottom, + pIntValue); break; case RTF_HEADERY: - putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, - NS_ooxml::LN_CT_PageMar_header, pIntValue); + putNestedAttribute(m_aStates.top().getSectionSprms(), + NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_header, + pIntValue); break; case RTF_FOOTERY: - putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgMar, - NS_ooxml::LN_CT_PageMar_footer, pIntValue); + putNestedAttribute(m_aStates.top().getSectionSprms(), + NS_ooxml::LN_EG_SectPrContents_pgMar, NS_ooxml::LN_CT_PageMar_footer, + pIntValue); break; case RTF_DEFTAB: m_aSettingsTableSprms.set(NS_ooxml::LN_CT_Settings_defaultTabStop, pIntValue); break; case RTF_LINEMOD: - putNestedAttribute(m_aStates.top().aSectionSprms, + putNestedAttribute(m_aStates.top().getSectionSprms(), NS_ooxml::LN_EG_SectPrContents_lnNumType, NS_ooxml::LN_CT_LineNumber_countBy, pIntValue); break; case RTF_LINEX: if (nParam) - putNestedAttribute(m_aStates.top().aSectionSprms, + putNestedAttribute(m_aStates.top().getSectionSprms(), NS_ooxml::LN_EG_SectPrContents_lnNumType, NS_ooxml::LN_CT_LineNumber_distance, pIntValue); break; @@ -1036,7 +1054,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) { // OOXML <w:lnNumType w:start="..."/> is 0-based, RTF is 1-based. auto pStart = tools::make_ref<RTFValue>(nParam - 1); - putNestedAttribute(m_aStates.top().aSectionSprms, + putNestedAttribute(m_aStates.top().getSectionSprms(), NS_ooxml::LN_EG_SectPrContents_lnNumType, NS_ooxml::LN_CT_LineNumber_start, pStart); } @@ -1340,8 +1358,9 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) break; } if (nValue != -1) - putNestedAttribute(m_aStates.top().aTableCellSprms, NS_ooxml::LN_CT_TcPrBase_shd, - NS_ooxml::LN_CT_Shd_val, new RTFValue(nValue)); + putNestedAttribute(m_aStates.top().getTableCellSprms(), + NS_ooxml::LN_CT_TcPrBase_shd, NS_ooxml::LN_CT_Shd_val, + new RTFValue(nValue)); } break; case RTF_DODHGT: @@ -1412,8 +1431,8 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) default: break; } - putNestedSprm(m_aStates.top().aTableCellSprms, NS_ooxml::LN_CT_TcPrBase_tcMar, nSprm, - new RTFValue(aAttributes)); + putNestedSprm(m_aStates.top().getTableCellSprms(), NS_ooxml::LN_CT_TcPrBase_tcMar, + nSprm, new RTFValue(aAttributes)); } break; case RTF_TRPADDFB: @@ -1446,9 +1465,9 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) default: break; } - putNestedAttribute(m_aStates.top().aTableCellSprms, NS_ooxml::LN_CT_TcPrBase_tcMar, + putNestedAttribute(m_aStates.top().getTableCellSprms(), NS_ooxml::LN_CT_TcPrBase_tcMar, nSprm, new RTFValue(aAttributes)); - putNestedAttribute(m_aDefaultState.aTableCellSprms, NS_ooxml::LN_CT_TcPrBase_tcMar, + putNestedAttribute(m_aDefaultState.getTableCellSprms(), NS_ooxml::LN_CT_TcPrBase_tcMar, nSprm, new RTFValue(aAttributes)); } break; @@ -1476,10 +1495,10 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) default: break; } - putNestedSprm(m_aStates.top().aTableCellSprms, NS_ooxml::LN_CT_TcPrBase_tcMar, nSprm, - new RTFValue(aAttributes)); - putNestedSprm(m_aDefaultState.aTableCellSprms, NS_ooxml::LN_CT_TcPrBase_tcMar, nSprm, - new RTFValue(aAttributes)); + putNestedSprm(m_aStates.top().getTableCellSprms(), NS_ooxml::LN_CT_TcPrBase_tcMar, + nSprm, new RTFValue(aAttributes)); + putNestedSprm(m_aDefaultState.getTableCellSprms(), NS_ooxml::LN_CT_TcPrBase_tcMar, + nSprm, new RTFValue(aAttributes)); } break; case RTF_FI: @@ -1540,18 +1559,20 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) aAttributes.set(NS_ooxml::LN_CT_TblWidth_type, new RTFValue(NS_ooxml::LN_Value_ST_TblWidth_dxa)); aAttributes.set(NS_ooxml::LN_CT_TblWidth_w, pIntValue); - putNestedSprm(m_aStates.top().aTableRowSprms, NS_ooxml::LN_CT_TblPrBase_tblCellMar, - NS_ooxml::LN_CT_TblCellMar_left, new RTFValue(aAttributes)); - putNestedSprm(m_aStates.top().aTableRowSprms, NS_ooxml::LN_CT_TblPrBase_tblCellMar, + putNestedSprm(m_aStates.top().getTableRowSprms(), + NS_ooxml::LN_CT_TblPrBase_tblCellMar, NS_ooxml::LN_CT_TblCellMar_left, + new RTFValue(aAttributes)); + putNestedSprm(m_aStates.top().getTableRowSprms(), + NS_ooxml::LN_CT_TblPrBase_tblCellMar, NS_ooxml::LN_CT_TblCellMar_right, new RTFValue(aAttributes)); } break; case RTF_TRFTSWIDTH: - putNestedAttribute(m_aStates.top().aTableRowSprms, NS_ooxml::LN_CT_TblPrBase_tblW, + putNestedAttribute(m_aStates.top().getTableRowSprms(), NS_ooxml::LN_CT_TblPrBase_tblW, NS_ooxml::LN_CT_TblWidth_type, pIntValue); break; case RTF_TRWWIDTH: - putNestedAttribute(m_aStates.top().aTableRowSprms, NS_ooxml::LN_CT_TblPrBase_tblW, + putNestedAttribute(m_aStates.top().getTableRowSprms(), NS_ooxml::LN_CT_TblPrBase_tblW, NS_ooxml::LN_CT_TblWidth_w, pIntValue); break; case RTF_PROPTYPE: diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index a281ad758e02..30c0e2e337f7 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -180,10 +180,10 @@ void putBorderProperty(RTFStack& aStates, Id nId, const RTFValue::Pointer_t& pVa pAttributes = &getLastAttributes(aStates.top().aParagraphSprms, NS_ooxml::LN_CT_PrBase_pBdr); else if (aStates.top().nBorderState == RTFBorderState::CELL) - pAttributes - = &getLastAttributes(aStates.top().aTableCellSprms, NS_ooxml::LN_CT_TcPrBase_tcBorders); + pAttributes = &getLastAttributes(aStates.top().getTableCellSprms(), + NS_ooxml::LN_CT_TcPrBase_tcBorders); else if (aStates.top().nBorderState == RTFBorderState::PAGE) - pAttributes = &getLastAttributes(aStates.top().aSectionSprms, + pAttributes = &getLastAttributes(aStates.top().getSectionSprms(), NS_ooxml::LN_EG_SectPrContents_pgBorders); if (pAttributes) pAttributes->set(nId, pValue); @@ -650,7 +650,7 @@ void RTFDocumentImpl::sectBreak(bool bFinal) OSL_THIS_FUNC << ": final? " << bFinal << ", needed? " << m_bNeedSect); bool bNeedSect = m_bNeedSect; RTFValue::Pointer_t pBreak - = m_aStates.top().aSectionSprms.find(NS_ooxml::LN_EG_SectPrContents_type); + = m_aStates.top().getSectionSprms().find(NS_ooxml::LN_EG_SectPrContents_type); bool bContinuous = pBreak.get() && pBreak->getInt() @@ -680,11 +680,12 @@ void RTFDocumentImpl::sectBreak(bool bFinal) { // In case the last section is a continuous one, we don't need to output a section break. if (bFinal && bContinuous) - m_aStates.top().aSectionSprms.erase(NS_ooxml::LN_EG_SectPrContents_type); + m_aStates.top().getSectionSprms().erase(NS_ooxml::LN_EG_SectPrContents_type); } // Section properties are a paragraph sprm. - auto pValue = new RTFValue(m_aStates.top().aSectionAttributes, m_aStates.top().aSectionSprms); + auto pValue + = new RTFValue(m_aStates.top().getSectionAttributes(), m_aStates.top().getSectionSprms()); RTFSprms aAttributes; RTFSprms aSprms; aSprms.set(NS_ooxml::LN_CT_PPr_sectPr, pValue); @@ -1476,7 +1477,7 @@ void RTFDocumentImpl::text(OUString& rString) } // Are we in the middle of the table definition? (No cell defs yet, but we already have some cell props.) - if (m_aStates.top().aTableCellSprms.find(NS_ooxml::LN_CT_TcPrBase_vAlign).get() + if (m_aStates.top().getTableCellSprms().find(NS_ooxml::LN_CT_TcPrBase_vAlign).get() && m_nTopLevelCells == 0) { m_aTableBufferStack.back().emplace_back( @@ -1544,22 +1545,22 @@ void RTFDocumentImpl::prepareProperties( // Table width. RTFValue::Pointer_t const pTableWidthProps - = rState.aTableRowSprms.find(NS_ooxml::LN_CT_TblPrBase_tblW); + = rState.getTableRowSprms().find(NS_ooxml::LN_CT_TblPrBase_tblW); if (!pTableWidthProps.get()) { auto pUnitValue = new RTFValue(3); - putNestedAttribute(rState.aTableRowSprms, NS_ooxml::LN_CT_TblPrBase_tblW, + putNestedAttribute(rState.getTableRowSprms(), NS_ooxml::LN_CT_TblPrBase_tblW, NS_ooxml::LN_CT_TblWidth_type, pUnitValue); auto pWValue = new RTFValue(nCurrentCellX); - putNestedAttribute(rState.aTableRowSprms, NS_ooxml::LN_CT_TblPrBase_tblW, + putNestedAttribute(rState.getTableRowSprms(), NS_ooxml::LN_CT_TblPrBase_tblW, NS_ooxml::LN_CT_TblWidth_w, pWValue); } if (nCells > 0) - rState.aTableRowSprms.set(NS_ooxml::LN_tblRow, new RTFValue(1)); + rState.getTableRowSprms().set(NS_ooxml::LN_tblRow, new RTFValue(1)); RTFValue::Pointer_t const pCellMar - = rState.aTableRowSprms.find(NS_ooxml::LN_CT_TblPrBase_tblCellMar); + = rState.getTableRowSprms().find(NS_ooxml::LN_CT_TblPrBase_tblCellMar); if (!pCellMar.get()) { // If no cell margins are defined, the default left/right margin is 0 in Word, but not in Writer. @@ -1567,14 +1568,14 @@ void RTFDocumentImpl::prepareProperties( aAttributes.set(NS_ooxml::LN_CT_TblWidth_type, new RTFValue(NS_ooxml::LN_Value_ST_TblWidth_dxa)); aAttributes.set(NS_ooxml::LN_CT_TblWidth_w, new RTFValue(0)); - putNestedSprm(rState.aTableRowSprms, NS_ooxml::LN_CT_TblPrBase_tblCellMar, + putNestedSprm(rState.getTableRowSprms(), NS_ooxml::LN_CT_TblPrBase_tblCellMar, NS_ooxml::LN_CT_TblCellMar_left, new RTFValue(aAttributes)); - putNestedSprm(rState.aTableRowSprms, NS_ooxml::LN_CT_TblPrBase_tblCellMar, + putNestedSprm(rState.getTableRowSprms(), NS_ooxml::LN_CT_TblPrBase_tblCellMar, NS_ooxml::LN_CT_TblCellMar_right, new RTFValue(aAttributes)); } o_rpTableRowProperties - = new RTFReferenceProperties(rState.aTableRowAttributes, rState.aTableRowSprms); + = new RTFReferenceProperties(rState.getTableRowAttributes(), rState.getTableRowSprms()); } void RTFDocumentImpl::sendProperties( @@ -1715,25 +1716,25 @@ void RTFDocumentImpl::backupTableRowProperties() { if (m_nTopLevelCurrentCellX) { - m_aBackupTableRowSprms = m_aStates.top().aTableRowSprms; - m_aBackupTableRowAttributes = m_aStates.top().aTableRowAttributes; + m_aBackupTableRowSprms = m_aStates.top().getTableRowSprms(); + m_aBackupTableRowAttributes = m_aStates.top().getTableRowAttributes(); m_nBackupTopLevelCurrentCellX = m_nTopLevelCurrentCellX; } } void RTFDocumentImpl::restoreTableRowProperties() { - m_aStates.top().aTableRowSprms = m_aBackupTableRowSprms; - m_aStates.top().aTableRowAttributes = m_aBackupTableRowAttributes; + m_aStates.top().getTableRowSprms() = m_aBackupTableRowSprms; + m_aStates.top().getTableRowAttributes() = m_aBackupTableRowAttributes; m_nTopLevelCurrentCellX = m_nBackupTopLevelCurrentCellX; } void RTFDocumentImpl::resetTableRowProperties() { - m_aStates.top().aTableRowSprms = m_aDefaultState.aTableRowSprms; - m_aStates.top().aTableRowSprms.set(NS_ooxml::LN_CT_TblGridBase_gridCol, new RTFValue(-1), - RTFOverwrite::NO_APPEND); - m_aStates.top().aTableRowAttributes = m_aDefaultState.aTableRowAttributes; + m_aStates.top().getTableRowSprms() = m_aDefaultState.getTableRowSprms(); + m_aStates.top().getTableRowSprms().set(NS_ooxml::LN_CT_TblGridBase_gridCol, new RTFValue(-1), + RTFOverwrite::NO_APPEND); + m_aStates.top().getTableRowAttributes() = m_aDefaultState.getTableRowAttributes(); if (Destination::NESTEDTABLEPROPERTIES == m_aStates.top().eDestination) { m_nNestedTRLeft = 0; @@ -3469,9 +3470,10 @@ RTFError RTFDocumentImpl::popState() { // Section break type created for \page still has an effect in the // outer state as well. - RTFValue::Pointer_t pType = aState.aSectionSprms.find(NS_ooxml::LN_EG_SectPrContents_type); + RTFValue::Pointer_t pType + = aState.getSectionSprms().find(NS_ooxml::LN_EG_SectPrContents_type); if (pType) - m_aStates.top().aSectionSprms.set(NS_ooxml::LN_EG_SectPrContents_type, pType); + m_aStates.top().getSectionSprms().set(NS_ooxml::LN_EG_SectPrContents_type, pType); } return RTFError::OK; diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index b62cf91b6a8a..853665cdefb9 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -504,6 +504,11 @@ public: RTFColorTableEntry& getCurrentColor() { return m_aCurrentColor; } RTFSprms& getTabAttributes() { return m_aTabAttributes; } RTFSprms& getTableCellAttributes() { return m_aTableCellAttributes; } + RTFSprms& getTableCellSprms() { return m_aTableCellSprms; } + RTFSprms& getTableRowAttributes() { return m_aTableRowAttributes; } + RTFSprms& getTableRowSprms() { return m_aTableRowSprms; } + RTFSprms& getSectionAttributes() { return m_aSectionAttributes; } + RTFSprms& getSectionSprms() { return m_aSectionSprms; } RTFDocumentImpl* m_pDocumentImpl; RTFInternalState nInternalState; @@ -519,16 +524,16 @@ public: // reset by pard RTFSprms aParagraphSprms; RTFSprms aParagraphAttributes; + +private: // reset by sectd - RTFSprms aSectionSprms; - RTFSprms aSectionAttributes; + RTFSprms m_aSectionSprms; + RTFSprms m_aSectionAttributes; // reset by trowd - RTFSprms aTableRowSprms; - RTFSprms aTableRowAttributes; + RTFSprms m_aTableRowSprms; + RTFSprms m_aTableRowAttributes; // reset by cellx - RTFSprms aTableCellSprms; - -private: + RTFSprms m_aTableCellSprms; RTFSprms m_aTableCellAttributes; // reset by tx RTFSprms m_aTabAttributes; |