diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-08-11 11:37:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-08-11 18:13:13 +0200 |
| commit | 6945d031e759823ab52bdf077e43196b67f594a4 (patch) | |
| tree | c1fa0095aa216498fe1a441488aeb7488e598cde /oox | |
| parent | c88855c45a675cf28e2cfe4fa261c2b0339f5898 (diff) | |
move setting properties into note comments from oox to sc
no change in behavior intended, the SdrCaption doesn't support
the skipped conditions
Change-Id: Id909ae4ed115c1ad3398d2a62c6432ff1dfde453
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155585
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/vml/vmlshape.cxx | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index c297fc1563bb..81ba42ba0a48 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -484,20 +484,11 @@ Reference< XShape > ShapeBase::convertAndInsert( const Reference< XShapes >& rxS return xShape; } -awt::Rectangle ShapeBase::convertFormatting( const Reference< XShape >& rxShape ) const +awt::Rectangle ShapeBase::getShapeRectangle() const { - if( !rxShape.is() ) - return awt::Rectangle(); - /* Calculate shape rectangle. Applications may do something special according to some imported shape client data (e.g. Excel cell anchor). */ - awt::Rectangle aShapeRect = calcShapeRectangle( nullptr ); - - // convert the shape, if the calculated rectangle is not empty - if( (aShapeRect.Width > 0) || (aShapeRect.Height > 0) ) - convertShapeProperties( rxShape ); - - return aShapeRect; + return calcShapeRectangle(nullptr); } void ShapeBase::setContainer(ShapeContainer* pContainer) { mpContainer = pContainer; } |