Skip to content

C
core
Kaydet (Commit) e587645f authored tarafından Samuel Mehrbrodt's avatar Samuel Mehrbrodt
Dosyalara gözat
Seçenekler

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: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
üst 376e3a48
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 4 deletions
sc/source/ui/unoobj/shapeuno.cxx
Dosyayı görüntüle @ e587645f
...@@ -493,7 +493,9 @@ void SAL_CALL ScShapeObj::setPropertyValue(const OUString& aPropertyName, const ...@@ -493,7 +493,9 @@ void SAL_CALL ScShapeObj::setPropertyValue(const OUString& aPropertyName, const
xShape->setPosition(aPoint); xShape->setPosition(aPoint);
pDocSh->SetModified(); 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::Size aUnoSize;
awt::Point aCaptionPoint; awt::Point aCaptionPoint;
...@@ -577,7 +579,9 @@ void SAL_CALL ScShapeObj::setPropertyValue(const OUString& aPropertyName, const ...@@ -577,7 +579,9 @@ void SAL_CALL ScShapeObj::setPropertyValue(const OUString& aPropertyName, const
xShape->setPosition(aPoint); xShape->setPosition(aPoint);
pDocSh->SetModified(); 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::Size aUnoSize;
awt::Point aCaptionPoint; awt::Point aCaptionPoint;
...@@ -705,7 +709,8 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName ) ...@@ -705,7 +709,8 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName )
uno::Reference<drawing::XShape> xShape( mxShapeAgg, uno::UNO_QUERY ); uno::Reference<drawing::XShape> xShape( mxShapeAgg, uno::UNO_QUERY );
if (xShape.is()) 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::Size aUnoSize;
awt::Point aCaptionPoint; awt::Point aCaptionPoint;
...@@ -765,7 +770,8 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName ) ...@@ -765,7 +770,8 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName )
uno::Reference<drawing::XShape> xShape( mxShapeAgg, uno::UNO_QUERY ); uno::Reference<drawing::XShape> xShape( mxShapeAgg, uno::UNO_QUERY );
if (xShape.is()) 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::Size aUnoSize;
awt::Point aCaptionPoint; awt::Point aCaptionPoint;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment