sw/source/core/layout/paintfrm.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 44092833d3a0f0d6074c64bd0e64bbdf11109afe Author: Michael Stahl <mst...@redhat.com> Date: Mon Apr 16 16:34:21 2012 +0200 fdo#38215: forgot idiotic C++ syntax (fix 0868a0155a) diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 255cf14..1c09c4d 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -500,7 +500,7 @@ lcl_TryMergeBorderLine(BorderLinePrimitive2D const& rThis, if (rThis.getStart().getX() == rOther.getStart().getX()) { assert(rThis.getEnd().getX() == rOther.getEnd().getX()); - pair<bool, pair<double, double>> const res = lcl_TryMergeLines( + pair<bool, pair<double, double> > const res = lcl_TryMergeLines( make_pair(rThis.getStart().getY(), rThis.getEnd().getY()), make_pair(rOther.getStart().getY(),rOther.getEnd().getY())); if (res.first) // merge them @@ -518,7 +518,7 @@ lcl_TryMergeBorderLine(BorderLinePrimitive2D const& rThis, if (rThis.getStart().getY() == rOther.getStart().getY()) { assert(rThis.getEnd().getY() == rOther.getEnd().getY()); - pair<bool, pair<double, double>> const res = lcl_TryMergeLines( + pair<bool, pair<double, double> > const res = lcl_TryMergeLines( make_pair(rThis.getStart().getX(), rThis.getEnd().getX()), make_pair(rOther.getStart().getX(),rOther.getEnd().getX())); if (res.first) // merge them _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits