diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2020-10-01 11:29:26 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-10-06 16:02:33 +0200 |
| commit | 7f0d347eb879cd5859ee13a4c79d185a88b12fcc (patch) | |
| tree | 4463c2ede47a3d66b976ef5a0562c0a65e481366 | |
| parent | 0e5e3434d23fff4e5ae8cd4d3201be3903bcae06 (diff) | |
tdf#137165 chart2: fix label position in Position and Size
dialog window.
Follow-up of commit 4223ff2be69f03e571464b0b09ad0d278918631b
(tdf#48436 Chart: add CustomLabelPosition UNO API property).
Change-Id: Ie676af7b9438b928041a404fb1efac6919b30030
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103750
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit 17b0eb43ac23cd82a06d54432a0ec22cffa5b3c7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103794
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | chart2/source/controller/main/ChartController_Position.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index 32c4bd78522e..52664c356257 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -114,11 +114,6 @@ void ChartController::executeDispatch_PositionAndSize(const ::css::uno::Sequence if( aCID.isEmpty() ) return; - awt::Size aSelectedSize; - ExplicitValueProvider* pProvider( comphelper::getUnoTunnelImplementation<ExplicitValueProvider>( m_xChartView ) ); - if( pProvider ) - aSelectedSize = ToSize( pProvider->getRectangleOfObject( aCID ) ); - ObjectType eObjectType = ObjectIdentifier::getObjectType( aCID ); UndoGuard aUndoGuard( @@ -181,8 +176,13 @@ void ChartController::executeDispatch_PositionAndSize(const ::css::uno::Sequence if(pOutItemSet || pArgs) { - awt::Rectangle aObjectRect; - lcl_getPositionAndSizeFromItemSet( aItemSet, aObjectRect, aSelectedSize ); + awt::Rectangle aOldObjectRect; + ExplicitValueProvider* pProvider(comphelper::getUnoTunnelImplementation<ExplicitValueProvider>( m_xChartView )); + if( pProvider ) + aOldObjectRect = pProvider->getRectangleOfObject(aCID); + + awt::Rectangle aNewObjectRect; + lcl_getPositionAndSizeFromItemSet( aItemSet, aNewObjectRect, ToSize(aOldObjectRect) ); awt::Size aPageSize( ChartModelHelper::getPageSize( getModel() ) ); awt::Rectangle aPageRect( 0,0,aPageSize.Width,aPageSize.Height ); @@ -194,7 +194,7 @@ void ChartController::executeDispatch_PositionAndSize(const ::css::uno::Sequence } bool bMoved = PositionAndSizeHelper::moveObject( m_aSelection.getSelectedCID(), getModel() - , aObjectRect, awt::Rectangle(), aPageRect ); + , aNewObjectRect, aOldObjectRect, aPageRect ); if( bMoved || bChanged ) aUndoGuard.commit(); } |