1. mst
  2. ooo340

Commits

obo  committed d301d9d

DEV300 masterfix: #i10000# fix merge problem

  • Participants
  • Parent commits f31bfa4
  • Branches default

Comments (0)

Files changed (1)

File svtools/source/contnr/svlbitm.cxx

View file
  • Ignore whitespace
     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,
                                                             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;