diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-10-01 03:21:59 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-01-07 17:49:44 +0100 |
| commit | 3272c1eb5563f3bda2caa24f32b1018372622109 (patch) | |
| tree | b4b948fd36ed53b1d8399babf2dbe701469da412 /include/oox | |
| parent | 5dfd5755c709e91d2903bd7be4582f7832e89780 (diff) | |
related tdf#100074: prepare group shapes text input via writerfilter
Put various preps into place, that enable us to read txbxContent from
group shape children via the writerfilter parser, which gets us much
more features
Also:
- store shapecontexthandler on wrapper class in writerfilter
- move adding children shapes to ctor, not dtor
- remove RuntimeException in Writer's XShapes::add(), aligns this
with Draw/Impress API semantics, and helps here when trying to
add the same shape a 2nd time (which we then simply ignore)
- make oox's Shape notion of 'inside group' less ad-hoc
- make SwTextBoxHelper::getTextRectangle() cope with more than
CustomShape - so passing in a group shape will also yield some
sensible bounding box
- have SwTextBoxHelper handle group content, too
- derive WpsContext from ShapeContext, so we can later substitute it
for that inside WpgContext
- keep WpgContext::onCreateContext() _for the moment_ with the old
delegation to ShapeContext (needs to use WpsContext to enable
writerfilter text input)
Change-Id: I2b0f0583e21137f3321a8dc13823058b14d19773
Reviewed-on: https://gerrit.libreoffice.org/65914
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'include/oox')
| -rw-r--r-- | include/oox/drawingml/shape.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 646fe01daa27..21972666f5f6 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -179,7 +179,8 @@ public: const css::uno::Reference< css::drawing::XShapes >& rxShapes, const basegfx::B2DHomMatrix& aTransformation, FillProperties& rShapeOrParentShapeFillProps, - ShapeIdMap* pShapeMap = nullptr ); + ShapeIdMap* pShapeMap = nullptr, + bool bInGroup = false); const css::uno::Reference< css::drawing::XShape > & getXShape() const { return mxShape; } @@ -225,7 +226,8 @@ protected: bool bClearText, bool bDoNotInsertEmptyTextBody, basegfx::B2DHomMatrix& aTransformation, - FillProperties& rShapeOrParentShapeFillProps + FillProperties& rShapeOrParentShapeFillProps, + bool bInGroup = false ); void addChildren( |