sw/source/core/doc/swtblfmt.cxx | 10 ++++++++++ sw/source/core/docnode/ndtbl.cxx | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-)
New commits: commit 3bbc021a8b091e4f50c9bd453fd11607a7cf45a9 Author: Alex Ivan <alexni...@yahoo.com> Date: Tue Aug 13 21:17:34 2013 +0300 Parent assigning cleanup Another place where I had previously not modified to the correct function. Change-Id: I1a2d024fcacf9d1de6eb8f5c3cd2e70bcd1771a9 diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 1a7ff43..36763c8 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -492,7 +492,7 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts, } } - SwTableFmt::AssignLineParents( pTableStyle, *pNdTbl ); + SwTableFmt::AssignFormatParents( pTableStyle, *pNdTbl ); // Insert Frms GetNodes().GoNext( &aNdIdx ); // Go to the next ContentNode commit fe8c43a6c96f3697553cdc4664ed0defd4dacc83 Author: Alex Ivan <alexni...@yahoo.com> Date: Tue Aug 13 17:42:13 2013 +0300 Fix borders update with table style application Change-Id: I9d794d96f3542bd3597ab38586df58edff62a16d diff --git a/sw/source/core/doc/swtblfmt.cxx b/sw/source/core/doc/swtblfmt.cxx index 965f3e8..5e3d88d 100644 --- a/sw/source/core/doc/swtblfmt.cxx +++ b/sw/source/core/doc/swtblfmt.cxx @@ -290,6 +290,8 @@ void SwTableFmt::AssignFormatParents( SwTableFmt* pSrcFmt, SwTable &rTable ) pLast->InvalidateAll(); pLast->SetCompletePaint(); } + + ((SwModify*)pHardFmt)->CheckCaching( RES_BOX ); } void SwTableFmt::AssignLineParents( SwTableFmt* pSrcFmt, SwTable &rTable ) @@ -324,6 +326,8 @@ void SwTableFmt::AssignLineParents( SwTableFmt* pSrcFmt, SwTable &rTable ) } AssignBoxParents( pFmt, *rTable.GetTabLines()[ n ] ); + + ((SwModify*)pLineFmt)->CheckCaching( RES_BOX ); } } @@ -360,6 +364,8 @@ void SwTableFmt::AssignBoxParents( SwTableLineFmt* pSrcLineFmt, SwTableLine &rLi if( rLine.GetTabBoxes()[ n ]->GetTabLines().size() ) AssignLineParents_Complex( pSrcLineFmt, pFmt, *rLine.GetTabBoxes()[ n ] ); + + ((SwModify*)pBoxFmt)->CheckCaching( RES_BOX ); } } @@ -382,6 +388,8 @@ void SwTableFmt::AssignLineParents_Complex( SwTableLineFmt* pSrcLineFmt, SwTable } AssignBoxParents_Complex( pSrcLineFmt, pSrcBoxFmt, *rBox.GetTabLines()[ n ] ); + + ((SwModify*)pLineFmt)->CheckCaching( RES_BOX ); } } @@ -405,6 +413,8 @@ void SwTableFmt::AssignBoxParents_Complex( SwTableLineFmt* pSrcLineFmt, SwTableB if( rLine.GetTabBoxes()[ n ]->GetTabLines().size() ) AssignLineParents_Complex( pSrcLineFmt, pSrcBoxFmt, *rLine.GetTabBoxes()[ n ] ); + + ((SwModify*)pBoxFmt)->CheckCaching( RES_BOX ); } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits