diff options
| author | Muhammad Haggag <mhaggag@gmail.com> | 2012-05-02 22:32:48 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-03 11:12:12 +0200 |
| commit | 002127460ad4b18fd66723e93c3d308ffc7207b1 (patch) | |
| tree | 34026ddad8bd813fbbaedd879588d7e357e8158e | |
| parent | 4d68b95cb9e2fcf761940de6f8662d21218452f2 (diff) | |
fdo#31005 Writer: Undo support for "Repeat Heading" in autoformat application
| -rw-r--r-- | cui/source/tabpages/border.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/inc/UndoTable.hxx | 1 | ||||
| -rw-r--r-- | sw/source/core/undo/untbl.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/table/tabledlg.cxx | 4 |
4 files changed, 9 insertions, 4 deletions
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 67bbeb9e0095..d6bf7a0be325 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -600,7 +600,7 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) const SfxPoolItem* pOld = 0; //------------------ - // outter border: + // outer border: //------------------ typedef ::std::pair<svx::FrameBorderType,sal_uInt16> TBorderPair; TBorderPair eTypes1[] = { diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx index 3f14ca41a38b..83edaa30a875 100644 --- a/sw/source/core/inc/UndoTable.hxx +++ b/sw/source/core/inc/UndoTable.hxx @@ -162,6 +162,7 @@ class SwUndoTblAutoFmt : public SwUndo _SaveTable* pSaveTbl; ::std::vector< ::boost::shared_ptr<SwUndoTblNumFmt> > m_Undos; sal_Bool bSaveCntntAttr; + sal_uInt16 m_nRepeatHeading; void UndoRedo(bool const bUndo, ::sw::UndoRedoContext & rContext); diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 0f295a14b528..33afb368ad3d 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -1473,6 +1473,7 @@ SwUndoTblAutoFmt::SwUndoTblAutoFmt( const SwTableNode& rTblNd, : SwUndo( UNDO_TABLE_AUTOFMT ), nSttNode( rTblNd.GetIndex() ), bSaveCntntAttr( sal_False ) + , m_nRepeatHeading(rTblNd.GetTable().GetRowsToRepeat()) { pSaveTbl = new _SaveTable( rTblNd.GetTable() ); @@ -1504,7 +1505,8 @@ SwUndoTblAutoFmt::UndoRedo(bool const bUndo, ::sw::UndoRedoContext & rContext) SwTableNode* pTblNd = rDoc.GetNodes()[ nSttNode ]->GetTableNode(); OSL_ENSURE( pTblNd, "kein TabellenNode" ); - _SaveTable* pOrig = new _SaveTable( pTblNd->GetTable() ); + SwTable& table = pTblNd->GetTable(); + _SaveTable* pOrig = new _SaveTable( table ); // dann auch noch ueber die ContentNodes der EndBoxen und // und alle Absatz-Attribute zusammen sammeln if( bSaveCntntAttr ) @@ -1516,6 +1518,8 @@ SwUndoTblAutoFmt::UndoRedo(bool const bUndo, ::sw::UndoRedoContext & rContext) { m_Undos.at(n-1)->UndoImpl(rContext); } + + table.SetRowsToRepeat(m_nRepeatHeading); } pSaveTbl->RestoreAttr( pTblNd->GetTable(), !bUndo ); diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 23fb5bccf430..9053b156935c 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -1409,7 +1409,7 @@ sal_Bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) { sal_Bool bModified = sal_False; - //Ueberschrift wiederholen + // Repeat Heading if(aHeadLineCB.IsChecked() != aHeadLineCB.GetSavedValue() || String::CreateFromInt32( static_cast< sal_Int32 >(aRepeatHeaderNF.GetValue()) ) != aRepeatHeaderNF.GetSavedValue() ) { @@ -1432,7 +1432,7 @@ sal_Bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) sal_Bool bState = aPageCollCB.IsChecked(); - //Wenn Seitenvorlage, dann kein Break + // If we have a page style, then there's no break sal_Bool bPageItemPut = sal_False; if ( bState != aPageCollCB.GetSavedValue() || ( bState && |