summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2019-03-29 07:43:00 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2019-04-04 23:58:37 +0200
commita8238d31249296de1eaa97a81677a667a6d4a806 (patch)
tree738cb53bc5b3bde644b45abd55249b9c408a361d /sc
parent6e50194af44c3602f34204a213d9ed1f8f2a0c0d (diff)
Related tdf#124329 Handle shapes resizing with the cell
The same as shapes just anchored to the cell. Change-Id: I0ce03e4c650dd10bd89cee87aa26775c32703d06 Reviewed-on: https://gerrit.libreoffice.org/70065 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit e587645f551c6c684f9f36606f8fa5e1b06004a1) Reviewed-on: https://gerrit.libreoffice.org/70263 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/unoobj/shapeuno.cxx14
1 files changed, 10 insertions, 4 deletions
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 04ef95a81e9f..aed1d55e389a 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -510,7 +510,9 @@ void SAL_CALL ScShapeObj::setPropertyValue(const OUString& aPropertyName, const
xShape->setPosition(aPoint);
pDocSh->SetModified();
}
- else if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL)
+ else if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL
+ || ScDrawLayer::GetAnchorType(*pObj)
+ == SCA_CELL_RESIZE)
{
awt::Size aUnoSize;
awt::Point aCaptionPoint;
@@ -595,7 +597,9 @@ void SAL_CALL ScShapeObj::setPropertyValue(const OUString& aPropertyName, const
xShape->setPosition(aPoint);
pDocSh->SetModified();
}
- else if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL)
+ else if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL
+ || ScDrawLayer::GetAnchorType(*pObj)
+ == SCA_CELL_RESIZE)
{
awt::Size aUnoSize;
awt::Point aCaptionPoint;
@@ -724,7 +728,8 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName )
uno::Reference<drawing::XShape> xShape( mxShapeAgg, uno::UNO_QUERY );
if (xShape.is())
{
- if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL)
+ if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL
+ || ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL_RESIZE)
{
awt::Size aUnoSize;
awt::Point aCaptionPoint;
@@ -784,7 +789,8 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName )
uno::Reference<drawing::XShape> xShape( mxShapeAgg, uno::UNO_QUERY );
if (xShape.is())
{
- if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL)
+ if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL
+ || ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL_RESIZE)
{
awt::Size aUnoSize;
awt::Point aCaptionPoint;