incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1387434 - /incubator/ooo/trunk/main/svx/source/svdraw/svddrgmt.cxx
Date Wed, 19 Sep 2012 01:55:58 GMT
Author: alg
Date: Wed Sep 19 01:55:57 2012
New Revision: 1387434

URL: http://svn.apache.org/viewvc?rev=1387434&view=rev
Log:
#120999# Added support code in SdrDragObjOwn::MoveSdrDrag to rescue the changed AutoGrowWidth
setting to allow instantaneous resizing of AutoGrowWidth objects even when using a cloned
SdrObject for the UI interaction

Modified:
    incubator/ooo/trunk/main/svx/source/svdraw/svddrgmt.cxx

Modified: incubator/ooo/trunk/main/svx/source/svdraw/svddrgmt.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/svdraw/svddrgmt.cxx?rev=1387434&r1=1387433&r2=1387434&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/svdraw/svddrgmt.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/svdraw/svddrgmt.cxx Wed Sep 19 01:55:57 2012
@@ -1364,6 +1364,19 @@ void SdrDragObjOwn::MoveSdrDrag(const Po
 					{
 						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(((SdrTextAutoGrowWidthItem&)pObj->GetMergedItem(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue());
+                        const bool bNewAutoGrowWidth(((SdrTextAutoGrowWidthItem&)mpClone->GetMergedItem(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue());
+
+                        if(bOldAutoGrowWidth != bNewAutoGrowWidth)
+                        {
+                            GetDragObj()->SetMergedItem(SdrTextAutoGrowWidthItem(bNewAutoGrowWidth));
+                        }
 					}
 
 					Show();



Mime
View raw message