Kaydet (Commit) dba57e8d authored tarafından Michael Stahl's avatar Michael Stahl

svx::frame::Style::operator< does not implement strict weak order

... at least since other single line styles than SOLID and DASHED
were added some years ago.

This causes an assertion from MSVC std::max in CppunitTest_sw_odfexport.

Change-Id: I2e0833b3d5c5afab259108be1c8782c4c4d26978
üst 3dfc300a
...@@ -318,7 +318,7 @@ bool Style::operator<( const Style& rOther) const ...@@ -318,7 +318,7 @@ bool Style::operator<( const Style& rOther) const
if( (Secn() && rOther.Secn()) && !rtl::math::approxEqual(Dist(), rOther.Dist()) ) return Dist() > rOther.Dist(); if( (Secn() && rOther.Secn()) && !rtl::math::approxEqual(Dist(), rOther.Dist()) ) return Dist() > rOther.Dist();
// both lines single and 1 unit thick, only one is dotted -> this<rOther, if this is dotted // both lines single and 1 unit thick, only one is dotted -> this<rOther, if this is dotted
if( (nLW == 1) && (Type() != rOther.Type()) ) return Type() != SvxBorderLineStyle::SOLID; if ((nLW == 1) && !Secn() && !rOther.Secn() && (Type() != rOther.Type())) return Type() > rOther.Type();
// seem to be equal // seem to be equal
return false; return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment