1 files changed, 43 insertions, 10 deletions

diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index edb0a65cb39f..ab5a71d88c32 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -406,7 +406,7 @@ BOOL SvLBoxButton::ClickHdl( SvLBox*, SvLBoxEntry* pEntry )
 }
 
 void SvLBoxButton::Paint( const Point& rPos, SvLBox& rDev, USHORT /* nFlags */,
-                            SvLBoxEntry* )
+                            SvLBoxEntry* /*pEntry*/ )
 {
     DBG_CHKTHIS(SvLBoxButton,0);
     USHORT nIndex = eKind == SvLBoxButtonKind_staticImage
@@ -418,14 +418,13 @@ void SvLBoxButton::Paint( const Point& rPos, SvLBox& rDev, USHORT /* nFlags */,
 //Native drawing
 ///
     BOOL bNativeOK = FALSE;
-    Window *pWin = NULL;
-    if( rDev.GetOutDevType() == OUTDEV_WINDOW )
-        pWin = (Window*) &rDev;
-
-    if ( nIndex != SV_BMP_STATICIMAGE && pWin && pWin->IsNativeControlSupported( (pData->IsRadio())? CTRL_RADIOBUTTON : CTRL_CHECKBOX, PART_ENTIRE_CONTROL) )
+    ControlType eCtrlType = (pData->IsRadio())? CTRL_RADIOBUTTON : CTRL_CHECKBOX;
+    if ( nIndex != SV_BMP_STATICIMAGE && rDev.IsNativeControlSupported( eCtrlType, PART_ENTIRE_CONTROL) )
     {
+        Size aSize(pData->Width(), pData->Height());
+        ImplAdjustBoxSize( aSize, eCtrlType, &rDev );
         ImplControlValue    aControlValue;
-        Rectangle           aCtrlRegion( rPos, Size(pData->Width(), pData->Height()) );
+        Rectangle           aCtrlRegion( rPos, aSize );
         ControlState        nState = 0;
 
         //states CTRL_STATE_DEFAULT, CTRL_STATE_PRESSED and CTRL_STATE_ROLLOVER are not implemented
@@ -439,8 +438,8 @@ void SvLBoxButton::Paint( const Point& rPos, SvLBox& rDev, USHORT /* nFlags */,
         else if ( IsStateTristate() )
             aControlValue.setTristateVal( BUTTONVALUE_MIXED );
 
-        bNativeOK = pWin->DrawNativeControl( (pData->IsRadio())? CTRL_RADIOBUTTON : CTRL_CHECKBOX, PART_ENTIRE_CONTROL,
-                                             aCtrlRegion, nState, aControlValue, rtl::OUString() );
+        bNativeOK = rDev.DrawNativeControl( eCtrlType, PART_ENTIRE_CONTROL,
+                                aCtrlRegion, nState, aControlValue, rtl::OUString() );
     }
 
     if( !bNativeOK)
@@ -459,13 +458,47 @@ void SvLBoxButton::Clone( SvLBoxItem* pSource )
     pData = ((SvLBoxButton*)pSource)->pData;
 }
 
+void SvLBoxButton::ImplAdjustBoxSize( Size& io_rSize, ControlType i_eType, Window* i_pParent )
+{
+    if ( i_pParent->IsNativeControlSupported( i_eType, PART_ENTIRE_CONTROL) )
+    {
+        ImplControlValue    aControlValue;
+        Region              aCtrlRegion( Rectangle( Point( 0, 0 ), io_rSize ) );
+        ControlState        nState = CTRL_STATE_ENABLED;
+
+        aControlValue.setTristateVal( BUTTONVALUE_ON );
+
+        Region aNativeBounds, aNativeContent;
+        bool bNativeOK = i_pParent->GetNativeControlRegion( i_eType,
+                                                            PART_ENTIRE_CONTROL,
+                                                            aCtrlRegion,
+                                                            nState,
+                                                            aControlValue,
+                                                            rtl::OUString(),
+                                                            aNativeBounds,
+                                                            aNativeContent );
+        if( bNativeOK )
+        {
+            Size aContentSize( aNativeContent.GetBoundRect().GetSize() );
+            // leave a little space around the box image (looks better
+            if( aContentSize.Height() + 2 > io_rSize.Height() )
+                io_rSize.Height() = aContentSize.Height() + 2;
+        }
+    }
+}
+
 void SvLBoxButton::InitViewData( SvLBox* pView,SvLBoxEntry* pEntry,
     SvViewDataItem* pViewData )
 {
     DBG_CHKTHIS(SvLBoxButton,0);
     if( !pViewData )
         pViewData = pView->GetViewDataItem( pEntry, this );
-    pViewData->aSize = Size( pData->Width(), pData->Height() );
+    Size aSize( pData->Width(), pData->Height() );
+
+    ControlType eCtrlType = (pData->IsRadio())? CTRL_RADIOBUTTON : CTRL_CHECKBOX;
+    if ( eKind != SvLBoxButtonKind_staticImage && pView )
+        ImplAdjustBoxSize( aSize, eCtrlType, pView );
+    pViewData->aSize = aSize;
 }
 
 bool SvLBoxButton::CheckModification() const