From 7df4ebf9a658681d02842b14187722ae8161cd7e Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Tue, 28 Apr 2020 14:42:29 +0200 Subject: tdf#132282: Revert fix for tdf#131554 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 912217285b3058efa54c2336f91fda4efdad6ff0 fixed the root cause of tdf#131554 and 69b83dc2d3014dd9b18402534e15c937dc082464 is no longer needed The unittest still passes Change-Id: I7c723b0c3cc2b56022978bbeb8bf6b3f6f93f1c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93063 Tested-by: Jenkins Reviewed-by: Xisco Faulí Signed-off-by: Xisco Fauli Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93073 Reviewed-by: Thorsten Behrens --- oox/source/ppt/pptshape.cxx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'oox') diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index 440103acff12..af7324485c65 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -424,7 +424,6 @@ namespace // 3. ph with nSecondSubType and the same oSubTypeIndex // 4. ph with nSecondSubType // 5. ph with the same oSubTypeIndex -// It appears 3 and 1 has the same highest prority. oox::drawingml::ShapePtr PPTShape::findPlaceholder( sal_Int32 nFirstSubType, sal_Int32 nSecondSubType, const OptValue< sal_Int32 >& oSubTypeIndex, std::vector< oox::drawingml::ShapePtr >& rShapes, bool bMasterOnly ) @@ -516,8 +515,7 @@ oox::drawingml::ShapePtr PPTShape::findPlaceholder( sal_Int32 nFirstSubType, sal } } - if (aPlaceholders.hasByPrio(0) || - aPlaceholders.hasByPrio(2)) + if (aPlaceholders.hasByPrio(0)) { break; } -- cgit