CWS-TOOLING: integrate CWS vcl98

2009-01-16 15:17:38 +0100 pl  r266422 : #i93515# add fix for compiz (thanks cmc)
2009-01-15 10:55:36 +0100 thb  r266352 : #i97399# start==end angle means no arc at all
2009-01-14 18:54:37 +0100 pl  r266327 : #i96536# #i96396# add: pagescroll for wheel events (thanks mod)
2009-01-14 18:21:06 +0100 pl  r266325 : #i96536# #i96396# add: gestures, bracket matching (thanks mod)
2009-01-13 12:03:29 +0100 hdu  r266206 : #i98024# preserve glyph zero-advance for artificial bold and vertical layout (thanks CMC!)
2009-01-12 16:32:20 +0100 hdu  r266167 : #i97991# fix rotated text: temporary workaround for #i87686#
2009-01-08 17:16:17 +0100 hdu  r266028 : #159054# ignore empty ATSULayout
2009-01-08 16:59:05 +0100 hdu  r266026 : #159054# prevent invalid ATSUStyle
2009-01-07 19:04:06 +0100 pl  r265976 : #158288# add extraction of fonts and individual object streams to pdfunzip
2009-01-07 14:42:17 +0100 pl  r265969 : #i93011# workaround our ancient accelerator mechanisms to have deeper child window hirearchies working
2009-01-07 14:39:15 +0100 pl  r265967 : #i93011# workaround our ancient accelerator mechanisms to have deeper child window hirearchies working
2009-01-07 11:10:58 +0100 hdu  r265956 : #i97522# getPixel() returns COL_BLACK on printers or when out of bounds
2009-01-06 18:41:48 +0100 pl  r265938 : #i97696# do not force user password to owner password after all
2009-01-06 18:00:52 +0100 pl  r265934 : #i97157# fix a snafu
2009-01-06 13:23:38 +0100 pl  r265914 : #i93515# support for _NET_WM_USER_TIME (thanks cmc)
2009-01-06 12:50:37 +0100 hdu  r265912 : #i97538# get rid of compiler warnings for complex logical expressions
2009-01-06 12:49:09 +0100 hdu  r265911 : #i97538# get rid of compiler warnings for complex logical expressions
2009-01-06 12:14:07 +0100 hdu  r265906 : #i97522# implemented AquaSalGraphics::getPixel()
2008-12-18 16:46:59 +0100 pl  r265706 : #i96343# reset quick job flag
2008-12-18 16:44:22 +0100 pl  r265705 : #i96343# reset quick job flag
2008-12-18 14:08:22 +0100 pl  r265688 : #i93241# fix bit field query
2008-12-18 12:41:52 +0100 pl  r265682 : #i93241# eliminate useless static locale variable
2008-12-17 19:23:07 +0100 pl  r265654 : #i97064# set language to OOo user configured UI language (thanks cmc)
2008-12-17 17:44:38 +0100 hdu  r265651 : #i97326# debug-helper: print cairo version
2008-12-17 17:43:15 +0100 hdu  r265650 : #i97326# ignore cairo changing the transformation of our FT_FACE
2008-12-17 14:44:32 +0100 pl  r265604 : #i93631# refine control positioning
2008-12-17 12:40:39 +0100 hdu  r265596 : #i97167# update VCL.xcu for MacOSX for Japanese (thanks maho!)
2008-12-17 11:59:51 +0100 hdu  r265592 : #i97317# code movement to prevent needless and expensive construction/destruction in error path
2008-12-17 11:54:43 +0100 hdu  r265590 : #i97317# workaround QUARTZ bug with drawing small polygons
2008-12-16 17:57:02 +0100 pl  r265567 : #i97138# select num copies when grabbing focus
2008-12-16 17:15:11 +0100 pl  r265561 : #i93173# lazy deletion of toolbars
2008-12-16 16:33:51 +0100 pl  r265558 : #i93173# lazy deletion of toolbars: reparent floating DockingWindows in doLazyDelete
2008-12-16 13:23:17 +0100 pl  r265536 : #i97196# ensure style engine has been loaded (thanks cmc)

1 files changed, 12 insertions, 11 deletions

diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index 14c211e4e045..c1c02b673658 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -397,13 +397,8 @@ SVMConverter::SVMConverter( SvStream& rStm, GDIMetaFile& rMtf, ULONG nConvertMod
 
 void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
 {
-    LineInfo            aLineInfo( LINE_NONE, 0 );
-    Stack               aLIStack;
-    ULONG               nPos = rIStm.Tell();
+    const ULONG         nPos = rIStm.Tell();
     const USHORT        nOldFormat = rIStm.GetNumberFormatInt();
-    rtl_TextEncoding    eActualCharSet = gsl_getSystemTextEncoding();
-    BOOL                bFatLine = FALSE;
-    VirtualDevice       aFontVDev;
 
     rIStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
 
@@ -412,14 +407,14 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
     INT16   nSize;
     INT16   nVersion;
 
-    // Header lesen
+    // read header
     rIStm.Read( (char*) &aCode, sizeof( aCode ) );  // Kennung
     rIStm >> nSize;                                 // Size
     rIStm >> nVersion;                              // Version
     rIStm >> aPrefSz.Width();                       // PrefSize.Width()
     rIStm >> aPrefSz.Height();                      // PrefSize.Height()
 
-    // Header-Kennung und Versionsnummer pruefen
+    // check header-magic and version
     if( rIStm.GetError()
         || ( memcmp( aCode, "SVGDI", sizeof( aCode ) ) != 0 )
         || ( nVersion != 200 ) )
@@ -427,9 +422,16 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
         rIStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
         rIStm.SetNumberFormatInt( nOldFormat );
         rIStm.Seek( nPos );
+        return;
     }
-    else
-    {
+
+    LineInfo            aLineInfo( LINE_NONE, 0 );
+    Stack               aLIStack;
+    VirtualDevice       aFontVDev;
+    rtl_TextEncoding    eActualCharSet = gsl_getSystemTextEncoding();
+    BOOL                bFatLine = FALSE;
+
+    // TODO: fix reindentation below if you can accept being blamed by the SCM
         MapMode     aMapMode;
         Polygon     aActionPoly;
         Rectangle   aRect;
@@ -1157,7 +1159,6 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
         // cleanup push-pop stack if neccessary
         for( void* pLineInfo = aLIStack.Pop(); pLineInfo; pLineInfo = aLIStack.Pop() )
             delete (LineInfo*) pLineInfo;
-    }
 
     rIStm.SetNumberFormatInt( nOldFormat );
 }