sw/source/core/doc/tblrwcl.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bcb0f41fad6cd32113a02bb3a23b9b2fa648398d
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Tue May 1 19:49:14 2012 +0200
Revert this not wanted test
Change-Id: Ie0d5cc1bd143240455b55ddf478fdf9fdd88654d
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 856e31d..4aa61c3 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -1764,7 +1764,7 @@ sal_Bool SwTable::OldMerge( SwDoc* pDoc, const
SwSelBoxes& rBoxes,
}
SwTableLine* pInsLine = new SwTableLine(
-
(SwTableLineFmt*)(&pFndBox->GetLines().front().GetLine()->GetFrmFmt()), 0,
+
(SwTableLineFmt*)pFndBox->GetLines().front().GetLine()->GetFrmFmt(), 0,
!pFndBox->GetUpper() ? 0 : pFndBox->GetBox() );
pInsLine->ClaimFrmFmt()->ResetFmtAttr( RES_FRM_SIZE );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
