diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-08 12:20:08 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-09 08:24:18 +0100 |
| commit | 9d93e030288aaa721761cb7991d1afdde6335777 (patch) | |
| tree | 861e7f155bfe80a24d3339938fa6c0f5887cbf39 /svx | |
| parent | 74708d3d06075c0f5e67e627cad348df28e3e9d1 (diff) | |
tdf#121116: don't adapt start/end widths if they are set explicitly
after commit b8fe3f84a60ea73aed9748844aee80441eb0fc7d
Related: #i122121# moved automatic StartEnd adaption to svx
Change-Id: Ic4639834ffa55d110f232fbad5f140a8e76df3e9
Reviewed-on: https://gerrit.libreoffice.org/63071
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdedtv1.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 433fbef97928..c7b8bf1de5c8 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -1016,12 +1016,16 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll) // #i38135# bool bResetAnimationTimer(false); + const bool bLineStartWidthExplicitChange(SfxItemState::SET + == aAttr.GetItemState(XATTR_LINESTARTWIDTH)); + const bool bLineEndWidthExplicitChange(SfxItemState::SET + == aAttr.GetItemState(XATTR_LINEENDWIDTH)); // check if LineWidth is part of the change - const bool bLineWidthChange(SfxItemState::SET == aAttr.GetItemState(XATTR_LINEWIDTH)); + const bool bAdaptStartEndWidths(!(bLineStartWidthExplicitChange && bLineEndWidthExplicitChange) + && SfxItemState::SET == aAttr.GetItemState(XATTR_LINEWIDTH)); sal_Int32 nNewLineWidth(0); - sal_Int32 nOldLineWidth(0); - if(bLineWidthChange) + if(bAdaptStartEndWidths) { nNewLineWidth = aAttr.Get(XATTR_LINEWIDTH).GetValue(); } @@ -1067,7 +1071,8 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll) aUpdaters.push_back(new E3DModifySceneSnapRectUpdater(pObj)); } - if(bLineWidthChange) + sal_Int32 nOldLineWidth(0); + if (bAdaptStartEndWidths) { nOldLineWidth = pObj->GetMergedItem(XATTR_LINEWIDTH).GetValue(); } @@ -1075,7 +1080,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll) // set attributes at object pObj->SetMergedItemSetAndBroadcast(aAttr, bReplaceAll); - if(bLineWidthChange) + if(bAdaptStartEndWidths) { const SfxItemSet& rSet = pObj->GetMergedItemSet(); |