cui/source/inc/grfpage.hxx | 1 + cui/source/tabpages/grfpage.cxx | 5 +++++ svx/source/svdraw/svdoashp.cxx | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-)
New commits: commit dfddb1d3029e1f129e94b5a2e802f32dd03fe188 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Jan 17 17:10:19 2014 +0000 need to call SetFrameSize on Resize otherwise if the crop tab is not the initial tab shown then it doesn't repaint correctly when it is shown Change-Id: Ie61819fe3fb089b716547fa5e54352ae04fd8087 diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 474565d..0b13e11 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -36,6 +36,7 @@ public: SvxCropExample( Window* pPar, WinBits nStyle ); virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); virtual Size GetOptimalSize() const; void SetTopLeft( const Point& rNew ) { aTopLeft = rNew; } diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 1a2592f..6b27019 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -786,6 +786,11 @@ void SvxCropExample::Paint( const Rectangle& ) DrawRect( aRect ); } +void SvxCropExample::Resize() +{ + SetFrameSize(aFrameSize); +} + void SvxCropExample::SetFrameSize( const Size& rSz ) { aFrameSize = rSz; commit 285d62c554956d44a66128f57952de492037ffde Author: Andre Fischer <a...@apache.org> Date: Fri Jan 17 15:45:31 2014 +0000 105491: Switched update of vertical flag and setting the item set to avoid infinite recursion. (cherry picked from commit bb94c19d2c7df1c468d38b7744e0d34e8ac27a99) diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 783f046..7e213b7 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -2298,10 +2298,10 @@ void SdrObjCustomShape::SetVerticalWriting( sal_Bool bVertical ) case SDRTEXTHORZADJUST_BLOCK: aNewSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_BLOCK)); break; } - SetObjectItemSet( aNewSet ); pOutlinerParaObject = GetOutlinerParaObject(); if ( pOutlinerParaObject ) pOutlinerParaObject->SetVertical(bVertical); + SetObjectItemSet( aNewSet ); // restore object size SetSnapRect(aObjectRect);
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits