diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-04-16 16:34:21 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-04-16 16:35:59 +0200 |
| commit | 44092833d3a0f0d6074c64bd0e64bbdf11109afe (patch) | |
| tree | 8f5a323ffe34bd81df5021ea3d91ccfb769236c2 | |
| parent | 119b0a666d49c54f6be00ff12d3bc9e129f8f339 (diff) | |
fdo#38215: forgot idiotic C++ syntax (fix 0868a0155a)
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 255cf146eee3..1c09c4db3e6d 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 |