INTEGRATION: CWS aw024 (1.19.8); FILE MERGED

2006/11/06 14:33:12 aw 1.19.8.1: #i71248# secured usage of XControl when importing html

sw/source/filter/html/htmlform.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: htmlform.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 22:10:07 $
+ *  last change: $Author: ihi $ $Date: 2006-11-14 15:13:26 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -873,6 +873,10 @@ void SwHTMLParser::SetControlSize( const Reference< drawing::XShape >& rShape,
 
     awt::Size aSz( rShape->getSize() );
     awt::Size aNewSz( 0, 0 );
+
+    // #i71248# ensure we got a XControl before apllying corrections
+    if(xControl.is())
+    {
         if( bMinWidth || bMinHeight )
         {
             Reference< awt::XLayoutConstrains > xLC( xControl, UNO_QUERY );
@@ -901,6 +905,7 @@ void SwHTMLParser::SetControlSize( const Reference< drawing::XShape >& rShape,
                     aNewSz.Height = aTmpSz.Height;
             }
         }
+    }
 
     if( Application::GetDefaultDevice() )
     {