ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#152199: Don't crop twice

Browse Source 
We have a "GraphicCrop" property that is supposed to roundtrip the
cropping in OOXML, but there is no core feature backing it (ie. the
image is not shown cropped when this is imported and set).

Instead, to show the image "cropped", we crop the image physically on
import (throw away pixels that are 'outside' of the cropped area).

But - the "GraphicCrop" is then saved on export, together with the image
already physically cropped, which leads to garbled DOCX on re-import.

Given that the core feature to show image cropped when the "GraphicCrop"
is set, let's avoid setting it when we physically crop the image.

Change-Id: Ia1090ea9c6d22e60c77d52bf65281f6588d07d4e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143216
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
This commit is contained in:
Jan Holesovsky
2022-11-24 21:58:46 +01:00
parent 1e9ace4c35
commit ab080ab1ab
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oox/source/drawingml/fillproperties.cxx
+5 -1
View File
@@ -853,7 +853,6 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap,
aGraphCrop.Right = static_cast< sal_Int32 >( ( static_cast< double >( aOriginalSize.Width ) * aFillRect.X2 ) / 100000 );
if ( aFillRect.Y2 )
aGraphCrop.Bottom = static_cast< sal_Int32 >( ( static_cast< double >( aOriginalSize.Height ) * aFillRect.Y2 ) / 100000 );
rPropMap.setProperty(PROP_GraphicCrop, aGraphCrop);
bool bHasCropValues = aGraphCrop.Left != 0 || aGraphCrop.Right !=0 || aGraphCrop.Top != 0 || aGraphCrop.Bottom != 0;
// Negative GraphicCrop values means "crop" here.
@@ -861,12 +860,17 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap,
if(bIsCustomShape && bHasCropValues && bNeedCrop)
{
// Physically crop the image
// In this case, don't set the PROP_GraphicCrop because that
// would lead to applying the crop twice after roundtrip
xGraphic = lclCropGraphic(xGraphic, CropQuotientsFromFillRect(aFillRect));
if (rPropMap.supportsProperty(ShapeProperty::FillBitmapName))
rPropMap.setProperty(ShapeProperty::FillBitmapName, xGraphic);
else
rPropMap.setProperty(ShapeProperty::FillBitmap, xGraphic);
}
else
rPropMap.setProperty(PROP_GraphicCrop, aGraphCrop);
}
}
}
sw/qa/extras/ooxmlexport/data/crop-roundtrip.docx
BIN
View File
Binary file not shown.
sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
+15
View File
@@ -14,6 +14,7 @@
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/text/GraphicCrop.hpp>
#include <com/sun/star/text/WritingMode2.hpp>
#include <com/sun/star/text/XFootnotesSupplier.hpp>
#include <com/sun/star/text/XTextDocument.hpp>
@@ -172,6 +173,20 @@ CPPUNIT_TEST_FIXTURE(Test, testSdtDuplicatedId)
assertXPath(pXmlDoc, "//w:sdt", 2);
}
CPPUNIT_TEST_FIXTURE(Test, testImageCropping)
{
loadAndReload("crop-roundtrip.docx");
// the image has no cropping after roundtrip, because it has been physically cropped
// NB: this test should be fixed when the core feature to show image cropped when it
// has the "GraphicCrop" is set is implemented
auto aGraphicCropStruct = getProperty<text::GraphicCrop>(getShape(1), "GraphicCrop");
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aGraphicCropStruct.Left);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aGraphicCropStruct.Right);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aGraphicCropStruct.Top);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aGraphicCropStruct.Bottom);
}
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */