wmf: add SAL_INFOs for interesting things at WMF import

Change-Id: Ic21709896fe156c7393ece54345b00bceb37587d

vcl/source/filter/wmf/winmtf.cxx

@@ -246,7 +246,7 @@ WinMtfFontStyle::WinMtfFontStyle( LOGFONTW& rFont )
     // Convert height to positive
     aFontSize.Height() = std::abs(aFontSize.Height());
 
-    aFont.SetSize( aFontSize );
+    aFont.SetSize(aFontSize);
 };
 
 WinMtf::WinMtf( WinMtfOutput* pWinMtfOutput, SvStream& rStreamWMF, FilterConfigItem* pConfigItem )
@@ -631,10 +631,7 @@ void WinMtfOutput::SetTextAlign( sal_uInt32 nAlign )
 
 void WinMtfOutput::ImplResizeObjectArry( sal_uInt32 nNewEntrys )
 {
-    sal_uInt32 i = vGDIObj.size();
-    vGDIObj.resize( nNewEntrys );
-    for ( ; i < nNewEntrys ; i++ )
-        vGDIObj[ i ] = NULL;
+    vGDIObj.resize(nNewEntrys, NULL);
 }
 
 void WinMtfOutput::ImplDrawClippedPolyPolygon( const PolyPolygon& rPolyPoly )

vcl/source/filter/wmf/winwmf.cxx

@@ -1102,8 +1102,13 @@ bool WMFReader::ReadHeader()
 
     Rectangle aPlaceableBound;
 
-    if (nPlaceableMetaKey == 0x9ac6cdd7L)
-    { //TODO do some real error handling here
+    bool bPlaceable = nPlaceableMetaKey == 0x9ac6cdd7L;
+
+    SAL_INFO("vcl.wmf", "Placeable: \"" << (bPlaceable ? "yes" : "no") << "\"");
+
+    if (bPlaceable)
+    {
+        //TODO do some real error handling here
         sal_Int16 nVal;
 
         // Skip reserved bytes
@@ -1143,6 +1148,11 @@ bool WMFReader::ReadHeader()
                           (double) pExternalHeader->xExt * 567 * nUnitsPerInch / 1440000,
                           (double) pExternalHeader->yExt * 567 * nUnitsPerInch / 1440000);
             aPlaceableBound = aExtRect;
+
+            SAL_INFO("vcl.wmf", "External header size "
+                    << " t: " << aPlaceableBound.Left()  << " l: " << aPlaceableBound.Top()
+                    << " b: " << aPlaceableBound.Right() << " r: " << aPlaceableBound.Bottom());
+
             pOut->SetMapMode( pExternalHeader->mapMode );
         }
         else
@@ -1163,6 +1173,10 @@ bool WMFReader::ReadHeader()
                                     aPlaceableBound.Top()    / fRatio,
                                     aPlaceableBound.Right()  / fRatio,
                                     aPlaceableBound.Bottom() / fRatio);
+
+                SAL_INFO("vcl.wmf", "Placeable bounds "
+                    << " t: " << aPlaceableBound.Left()  << " l: " << aPlaceableBound.Top()
+                    << " b: " << aPlaceableBound.Right() << " r: " << aPlaceableBound.Bottom());
             }
         }
 
@@ -1173,6 +1187,9 @@ bool WMFReader::ReadHeader()
     Size aWMFSize( labs( aPlaceableBound.GetWidth() ), labs( aPlaceableBound.GetHeight() ) );
     pOut->SetWinExt( aWMFSize );
 
+    SAL_INFO("vcl.wmf", "WMF size "
+                    << " w: " << aWMFSize.Width()    << " h: " << aWMFSize.Height());
+
     Size aDevExt( 10000, 10000 );
     if( ( labs( aWMFSize.Width() ) > 1 ) && ( labs( aWMFSize.Height() ) > 1 ) )
     {
@@ -1183,6 +1200,9 @@ bool WMFReader::ReadHeader()
     }
     pOut->SetDevExt( aDevExt );
 
+    SAL_INFO("vcl.wmf", "Dev size "
+                    << " w: " << aDevExt.Width()    << " h: " << aDevExt.Height());
+
     // read the METAHEADER
     sal_uInt32 nMetaKey(0);
     pWMF->ReadUInt32( nMetaKey ); // type and headersize
@@ -1453,7 +1473,7 @@ bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pStm )
                         nPoints += nP;
                     }
 
-                    SAL_WARN_IF(!bRecordOk, "vcl.filter", "polypolygon record has more polygons than we can handle");
+                    SAL_WARN_IF(!bRecordOk, "vcl.wmf", "polypolygon record has more polygons than we can handle");
 
                     bRecordOk = bRecordOk && pStm->good();
 
@@ -1587,14 +1607,23 @@ bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pStm )
         if (aWinOrg && aWinExt)
         {
             rPlaceableBound = Rectangle(*aWinOrg, *aWinExt);
+            SAL_INFO("vcl.wmf", "Window dimension "
+                    << " t: " << rPlaceableBound.Left()  << " l: " << rPlaceableBound.Top()
+                    << " b: " << rPlaceableBound.Right() << " r: " << rPlaceableBound.Bottom());
         }
         else if (aViewportOrg && aViewportExt)
         {
             rPlaceableBound = Rectangle(*aViewportOrg, *aViewportExt);
+            SAL_INFO("vcl.wmf", "Viewport dimension "
+                    << " t: " << rPlaceableBound.Left()  << " l: " << rPlaceableBound.Top()
+                    << " b: " << rPlaceableBound.Right() << " r: " << rPlaceableBound.Bottom());
         }
         else
         {
             rPlaceableBound = aBound;
+            SAL_INFO("vcl.wmf", "Detemined dimension "
+                    << " t: " << rPlaceableBound.Left()  << " l: " << rPlaceableBound.Top()
+                    << " b: " << rPlaceableBound.Right() << " r: " << rPlaceableBound.Bottom());
         }
     }