summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svddrgmt.cxx27
1 files changed, 12 insertions, 15 deletions
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index b28c8a90b0f4..c3d7f9791190 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1349,23 +1349,20 @@ void SdrDragObjOwn::MoveSdrDrag(const Point& rNoSnapPnt)
}
// create a new clone and modify to current drag state
- if(!mpClone)
- {
- mpClone = pObj->getFullDragClone();
- mpClone->applySpecialDrag(DragStat());
+ mpClone = pObj->getFullDragClone();
+ mpClone->applySpecialDrag(DragStat());
- // #120999# AutoGrowWidth may change for SdrTextObj due to the automatism used
- // with bDisableAutoWidthOnDragging, so not only geometry changes but
- // also this (pretty indirect) property change is possible. If it gets
- // changed, it needs to be copied to the original since nothing will
- // happen when it only changes in the drag clone
- const bool bOldAutoGrowWidth(((SdrOnOffItem&)pObj->GetMergedItem(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue());
- const bool bNewAutoGrowWidth(((SdrOnOffItem&)mpClone->GetMergedItem(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue());
+ // #120999# AutoGrowWidth may change for SdrTextObj due to the automatism used
+ // with bDisableAutoWidthOnDragging, so not only geometry changes but
+ // also this (pretty indirect) property change is possible. If it gets
+ // changed, it needs to be copied to the original since nothing will
+ // happen when it only changes in the drag clone
+ const bool bOldAutoGrowWidth(((SdrOnOffItem&)pObj->GetMergedItem(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue());
+ const bool bNewAutoGrowWidth(((SdrOnOffItem&)mpClone->GetMergedItem(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue());
- if(bOldAutoGrowWidth != bNewAutoGrowWidth)
- {
- GetDragObj()->SetMergedItem(makeSdrTextAutoGrowWidthItem(bNewAutoGrowWidth));
- }
+ if (bOldAutoGrowWidth != bNewAutoGrowWidth)
+ {
+ GetDragObj()->SetMergedItem(makeSdrTextAutoGrowWidthItem(bNewAutoGrowWidth));
}
Show();
17:52:29 +0200'>2015-10-12Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY codeStephan Bergmann 2015-09-28Return std::unique_ptr from SvTreeListBox::CreateContextMenuStephan Bergmann 2015-09-14convert EDIT_MODE to scoped enumNoel Grandin 2015-09-14convert CONTENT_TYPE to scoped enumNoel Grandin 2015-09-11convert Link<> to typedNoel Grandin 2015-09-07convert Link<> to typedNoel Grandin 2015-08-28make PostUserEvent Link<> typedNoel Grandin 2015-07-22loplugin:unusedmethods sw(part2)Noel Grandin 2015-07-20convert to typed Link<> in sfx2Noel Grandin 2015-06-10coverity#1302618 deref of NULLCaolán McNamara 2015-05-20bin/rename-sw-abbreviations.shlibreoffice-5-0-branch-pointChristian Lohmaier 2015-05-11refactor TreeListBox to use RenderContextTomaž Vajngerl 2015-05-05Use typed Timer::SetTimeoutHdl LinkStephan Bergmann 2015-04-28Merge remote-tracking branch 'origin/feature/vclptr'Michael Meeks 2015-04-15remove unnecessary use of void in function declarationsNoel Grandin 2015-04-10vclwidget: change all vcl::window fields to be wrapped in VclPtrNoel Grandin 2015-04-09vcl: VclPtr conversion in swNoel Grandin 2015-01-29callcatcher: large newly detected unused methods post de-virtualizationCaolán McNamara 2015-01-26new loplugin: change virtual methods to non-virtualNoel Grandin 2015-01-22Some more loplugin:cstylecast: swStephan Bergmann 2014-11-21fdo#85886 don't redraw the Navigator content tree if nothing changedMichael Stahl 2014-09-23fdo#82577: Handle WindowNoel Grandin 2014-07-22sal_uInt16 to more proper integer types, constifyMatteo Casalin 2014-06-03sw: fix include guardsThomas Arnhold 2014-05-27sw: move sw/source/core/uibase to sw/source/uibaseMichael Stahl