From deee1f03fb16af83c642121a5682af3398d90ece Mon Sep 17 00:00:00 2001
From: obo <obo@openoffice.org>
Date: Fri, 30 Jul 2010 13:29:03 +0200
Subject: DEV300 masterfix: #i10000# fix merge problem

---
 svtools/source/contnr/svlbitm.cxx | 6 +++---
 1 file 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;
-- 
cgit v1.2.3