sc/source/ui/unoobj/shapeuno.cxx | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
New commits:
commit acc33b803ebff910139c7a7cabba6aa2e242fad3
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Fri Mar 29 07:43:00 2019 +0100
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Mon Apr 8 13:44:20 2019 +0200
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.mehrbr...@cib.de>
(cherry picked from commit e587645f551c6c684f9f36606f8fa5e1b06004a1)
Reviewed-on: https://gerrit.libreoffice.org/70401
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 49ce7146ccd1..739fd4223fb1 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -507,7 +507,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;
@@ -591,7 +593,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;
@@ -719,7 +723,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;
@@ -779,7 +784,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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
