diff options
author | Christian Lippka <cl@openoffice.org> | 2002-07-18 08:02:03 +0000 |
---|---|---|
committer | Christian Lippka <cl@openoffice.org> | 2002-07-18 08:02:03 +0000 |
commit | e72c3fe19eec8c96aaa658a7c6e193f81a0d1664 (patch) | |
tree | 832678bd1f129af4196d7d44e22cd626663d53c9 /svx/source/tbxctrls/linectrl.cxx | |
parent | 96619c96da2257cc5a85c53d3c2f5df1eb22ceb3 (diff) |
#101454# check for recursion in Resize()
Diffstat (limited to 'svx/source/tbxctrls/linectrl.cxx')
-rw-r--r-- | svx/source/tbxctrls/linectrl.cxx | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 1927e46eca28..c69c71bb50c2 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: linectrl.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:01:27 $ + * last change: $Author: cl $ $Date: 2002-07-18 09:02:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -468,8 +468,8 @@ SvxLineEndWindow::SvxLineEndWindow( USHORT nId, const String& rWndTitle, SfxBind nCols ( 2 ), nLines ( 12 ), nLineEndWidth ( 400 ), - bPopupMode ( TRUE ) - + bPopupMode ( TRUE ), + mbInResize ( false ) { SfxObjectShell* pDocSh = SfxObjectShell::Current(); const SfxPoolItem* pItem = NULL; @@ -608,19 +608,26 @@ void SvxLineEndWindow::FillValueSet() void SvxLineEndWindow::Resize() { - if ( !IsRollUp() ) + // since we change the size inside this call, check if we + // are called recursive + if( !mbInResize ) { - aLineEndSet.SetColCount( nCols ); - aLineEndSet.SetLineCount( nLines ); + mbInResize = true; + if ( !IsRollUp() ) + { + aLineEndSet.SetColCount( nCols ); + aLineEndSet.SetLineCount( nLines ); - SetSize(); + SetSize(); - Size aSize = GetOutputSizePixel(); - aSize.Width() -= 4; - aSize.Height() -= 4; - aLineEndSet.SetPosSizePixel( Point( 2, 2 ), aSize ); + Size aSize = GetOutputSizePixel(); + aSize.Width() -= 4; + aSize.Height() -= 4; + aLineEndSet.SetPosSizePixel( Point( 2, 2 ), aSize ); + } + //SfxPopupWindow::Resize(); + mbInResize = false; } - //SfxPopupWindow::Resize(); } // ----------------------------------------------------------------------- |