sd/source/filter/ppt/pptin.cxx | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit e6aaa9467391488a1399642df67c63f85821dcf9
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Dec 16 19:49:42 2018 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Dec 16 21:56:36 2018 +0100
crashtesting: assert on import of ooo121169-1.ppt
Change-Id: I3b57bdd9a29ef41900bbb244daa27bf6d8c673c7
Error: comparison doesn't meet irreflexive requirements, assert(!(a < a)).
Reviewed-on: https://gerrit.libreoffice.org/65228
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 4ab0fdf1032e..f5d10bfde69b 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1492,14 +1492,12 @@ struct Ppt97AnimationStlSortHelper
bool Ppt97AnimationStlSortHelper::operator()( const std::pair< SdrObject*,
Ppt97AnimationPtr >& p1, const std::pair< SdrObject*, Ppt97AnimationPtr >& p2 )
{
if( !p1.second.get() || !p2.second.get() )
- return true;
+ return p1.second.get() < p2.second.get();
if( *p1.second < *p2.second )
return true;
if( *p1.second > *p2.second )
return false;
- if( p1.first->GetOrdNum() < p2.first->GetOrdNum() )
- return true;
- return false;
+ return p1.first->GetOrdNum() < p2.first->GetOrdNum();
}
void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool
bNewAnimationsUsed )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
