diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2015-09-26 17:55:31 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-09-27 22:48:21 +0200 |
| commit | 73f4a06c0bce51c7c8b9ae9adfdc7ffac27d06b4 (patch) | |
| tree | aec530a6ce7f784b113544ccc4cc794b167338b2 /sw/source/core/frmedt | |
| parent | ac6f8bc92b1abe995694602f43d8ad108b7030fb (diff) | |
sw table styles: Insert column, split table, delete row/column.
Make these operations applying the table style too.
Change-Id: Iee2808a5a5c5f84538474b8fbc6bf53d1fab19b7
Diffstat (limited to 'sw/source/core/frmedt')
| -rw-r--r-- | sw/source/core/frmedt/fetab.cxx | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 191ba23edca2..5d4551cf9982 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -1181,22 +1181,25 @@ bool SwFEShell::SetTableStyle(const SwTableAutoFormat& rStyle) // make sure SwDoc has the style GetDoc()->GetTableStyles().AddAutoFormat(rStyle); - SwTableNode *pTableNd = const_cast<SwTableNode*>(IsCrsrInTable()); - if (!pTableNd) + SwTableNode *pTableNode = const_cast<SwTableNode*>(IsCrsrInTable()); + if (!pTableNode) return false; // set the name & update - pTableNd->GetTable().SetTableStyleName(rStyle.GetName()); - return UpdateTableStyleFormatting(); + pTableNode->GetTable().SetTableStyleName(rStyle.GetName()); + return UpdateTableStyleFormatting(pTableNode); } -bool SwFEShell::UpdateTableStyleFormatting() +bool SwFEShell::UpdateTableStyleFormatting(SwTableNode *pTableNode) { - SwTableNode *pTableNd = const_cast<SwTableNode*>(IsCrsrInTable()); - if( !pTableNd || pTableNd->GetTable().IsTableComplex() ) - return false; + if (!pTableNode) + { + pTableNode = const_cast<SwTableNode*>(IsCrsrInTable()); + if (!pTableNode || pTableNode->GetTable().IsTableComplex()) + return false; + } - OUString aTableStyleName(pTableNd->GetTable().GetTableStyleName()); + OUString aTableStyleName(pTableNode->GetTable().GetTableStyleName()); SwTableAutoFormat* pTableStyle = GetDoc()->GetTableStyles().FindAutoFormat(aTableStyleName); if (!pTableStyle) return false; @@ -1211,7 +1214,7 @@ bool SwFEShell::UpdateTableStyleFormatting() ::GetTableSelCrs( *this, aBoxes ); else { - const SwTableSortBoxes& rTBoxes = pTableNd->GetTable().GetTabSortBoxes(); + const SwTableSortBoxes& rTBoxes = pTableNode->GetTable().GetTabSortBoxes(); for (size_t n = 0; n < rTBoxes.size(); ++n) { SwTableBox* pBox = rTBoxes[ n ]; |