summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2019-03-29 07:43:00 +0100
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2019-04-02 09:48:04 +0200
commite587645f551c6c684f9f36606f8fa5e1b06004a1 (patch)
tree502545657093e54db9cac4a131c3649bad913fd9
parent376e3a4893356d2eb7c2a5a902b533982e2663ae (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>
-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 fe05f5155192..8c2b504964f1 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -493,7 +493,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;
@@ -577,7 +579,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;
@@ -705,7 +709,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;
@@ -765,7 +770,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;