summaryrefslogtreecommitdiff
path: root/oox/source/vml/vmlshape.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-11-24 09:22:16 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-11-27 09:57:42 +0000
commitd66df3d35030bf725fa7e3d78420344ddd44478c (patch)
tree28b8fdb553c77db152adf068cc48e679baafcd0d /oox/source/vml/vmlshape.cxx
parenta38963a40eed7f1d85767b393a316870c31bff5c (diff)
tdf#78902 VML import: workaround for extreme top margin
Regression from commit 2b78f2cd7b9e4bab0f3b3b9119238f36a1bbc7b2 (rhbz#988516: DOCX import: fix context stack when importing header/footer, 2014-03-05), though that just made an existing Writer layout problem visible. RTF/WW8/newer (drawingML) DOCX import doesn't have this problem, as those import pictures as sw graphics, not draw ones. <w10:wrap type="through"/> is normally mapped to our page wrap (as it uses "through" in the "not only wrap around, but also in the holes of the shape, if it has any" context, not in our "text should go through it, so no wrapping" one), but for some reason in this case (most probably due to the extreme large negative margins) Word handles the situation as our through, i.e. the text should not go to the second page, as it would normally happen with a "Word through" wrapping. Work around the strange situation by ignoring the wrapping request for extreme top margin values. (cherry picked from commit 37b5f1ed3139b8569bfec0fcb5077f6b66b79acd) Conflicts: oox/source/vml/vmlshape.cxx sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I20555b1fa7a769e20c40a3a5ff3873807403e937 Reviewed-on: https://gerrit.libreoffice.org/20212 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'oox/source/vml/vmlshape.cxx')
-rw-r--r--oox/source/vml/vmlshape.cxx27
1 files changed, 18 insertions, 9 deletions
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 539467787866..aa07015d68c6 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -527,11 +527,18 @@ SimpleShape::SimpleShape( Drawing& rDrawing, const OUString& rService ) :
{
}
-void lcl_setSurround(PropertySet& rPropSet, const ShapeTypeModel& rTypeModel)
+void lcl_setSurround(PropertySet& rPropSet, const ShapeTypeModel& rTypeModel, const GraphicHelper& rGraphicHelper)
{
+ OUString aWrapType = rTypeModel.moWrapType.get();
+
+ // Extreme negative top margin? Then the shape will end up at the top of the page, it's pointless to perform any kind of wrapping.
+ sal_Int32 nMarginTop = ConversionHelper::decodeMeasureToHmm(rGraphicHelper, rTypeModel.maMarginTop, 0, false, true);
+ if (nMarginTop < -35277) // Less than 1000 points.
+ aWrapType.clear();
+
sal_Int32 nSurround = com::sun::star::text::WrapTextMode_THROUGHT;
- if ( rTypeModel.moWrapType.get() == "square" || rTypeModel.moWrapType .get()== "tight" ||
- rTypeModel.moWrapType.get() == "through" )
+ if ( aWrapType == "square" || aWrapType == "tight" ||
+ aWrapType == "through" )
{
nSurround = com::sun::star::text::WrapTextMode_PARALLEL;
if ( rTypeModel.moWrapSide.get() == "left" )
@@ -539,13 +546,13 @@ void lcl_setSurround(PropertySet& rPropSet, const ShapeTypeModel& rTypeModel)
else if ( rTypeModel.moWrapSide.get() == "right" )
nSurround = com::sun::star::text::WrapTextMode_RIGHT;
}
- else if ( rTypeModel.moWrapType.get() == "topAndBottom" )
+ else if ( aWrapType == "topAndBottom" )
nSurround = com::sun::star::text::WrapTextMode_NONE;
rPropSet.setProperty(PROP_Surround, nSurround);
}
-void lcl_SetAnchorType(PropertySet& rPropSet, const ShapeTypeModel& rTypeModel)
+void lcl_SetAnchorType(PropertySet& rPropSet, const ShapeTypeModel& rTypeModel, const GraphicHelper& rGraphicHelper)
{
if ( rTypeModel.maPositionHorizontal == "center" )
rPropSet.setAnyProperty(PROP_HoriOrient, makeAny(text::HoriOrientation::CENTER));
@@ -608,7 +615,7 @@ void lcl_SetAnchorType(PropertySet& rPropSet, const ShapeTypeModel& rTypeModel)
{
rPropSet.setProperty(PROP_AnchorType, text::TextContentAnchorType_AS_CHARACTER);
}
- lcl_setSurround( rPropSet, rTypeModel );
+ lcl_setSurround( rPropSet, rTypeModel, rGraphicHelper );
}
void lcl_SetRotation(PropertySet& rPropSet, const sal_Int32 nRotation)
@@ -810,7 +817,7 @@ Reference< XShape > SimpleShape::implConvertAndInsert( const Reference< XShapes
}
}
- lcl_SetAnchorType(aPropertySet, maTypeModel);
+ lcl_SetAnchorType(aPropertySet, maTypeModel, rGraphicHelper);
return xShape;
}
@@ -839,7 +846,8 @@ Reference< XShape > SimpleShape::createPictureObject( const Reference< XShapes >
if ( !maTypeModel.maRotation.isEmpty() )
lcl_SetRotation( aPropSet, maTypeModel.maRotation.toInt32() );
- lcl_SetAnchorType(aPropSet, maTypeModel);
+ const GraphicHelper& rGraphicHelper = mrDrawing.getFilter().getGraphicHelper();
+ lcl_SetAnchorType(aPropSet, maTypeModel, rGraphicHelper);
}
return xShape;
}
@@ -1228,7 +1236,8 @@ Reference< XShape > GroupShape::implConvertAndInsert( const Reference< XShapes >
}
// Make sure group shapes are inline as well, unless there is an explicit different style.
PropertySet aPropertySet(xGroupShape);
- lcl_SetAnchorType(aPropertySet, maTypeModel);
+ const GraphicHelper& rGraphicHelper = mrDrawing.getFilter().getGraphicHelper();
+ lcl_SetAnchorType(aPropertySet, maTypeModel, rGraphicHelper);
if (!maTypeModel.maRotation.isEmpty())
lcl_SetRotation(aPropertySet, maTypeModel.maRotation.toInt32());
return xGroupShape;