diff options
| author | obo <obo@openoffice.org> | 2010-07-30 13:29:03 +0200 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-07-30 13:29:03 +0200 |
| commit | deee1f03fb16af83c642121a5682af3398d90ece (patch) | |
| tree | 3a0465965f17ca8f56d748e8c768c9fdc7c63e34 | |
| parent | a2cc136ba19ab14d8c3ebf5a8238855e97dd8357 (diff) | |
DEV300 masterfix: #i10000# fix merge problem
Notes
split repo tag: libs-gui_ooo/DEV300_m86
| -rw-r--r-- | svtools/source/contnr/svlbitm.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index ab5a71d88c32..d260f984c2b0 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -463,12 +463,12 @@ void SvLBoxButton::ImplAdjustBoxSize( Size& io_rSize, ControlType i_eType, Windo if ( i_pParent->IsNativeControlSupported( i_eType, PART_ENTIRE_CONTROL) ) { ImplControlValue aControlValue; - Region aCtrlRegion( Rectangle( Point( 0, 0 ), io_rSize ) ); + Rectangle aCtrlRegion( Point( 0, 0 ), io_rSize ); ControlState nState = CTRL_STATE_ENABLED; aControlValue.setTristateVal( BUTTONVALUE_ON ); - Region aNativeBounds, aNativeContent; + Rectangle aNativeBounds, aNativeContent; bool bNativeOK = i_pParent->GetNativeControlRegion( i_eType, PART_ENTIRE_CONTROL, aCtrlRegion, @@ -479,7 +479,7 @@ void SvLBoxButton::ImplAdjustBoxSize( Size& io_rSize, ControlType i_eType, Windo aNativeContent ); if( bNativeOK ) { - Size aContentSize( aNativeContent.GetBoundRect().GetSize() ); + Size aContentSize( aNativeContent.GetSize() ); // leave a little space around the box image (looks better if( aContentSize.Height() + 2 > io_rSize.Height() ) io_rSize.Height() = aContentSize.Height() + 2; |