CWS-TOOLING: integrate CWS vcl100

2009-03-26 21:27:56 +0100 pl  r270106 : #i10000# fix an include path missing when using configure
2009-03-16 12:18:24 +0100 pl  r269518 : #i98963# revert change
2009-03-13 14:56:47 +0100 pl  r269483 : #i98980# work around a mysterious crash
2009-03-12 20:02:48 +0100 pl  r269440 : resolve some warnings
2009-03-12 19:30:32 +0100 pl  r269439 : resolve some warnings
2009-03-12 18:07:47 +0100 pl  r269432 : solve some warnings
2009-03-12 09:07:33 +0100 hdu  r269358 : #i100134# remove obsolete RCS/CVS keywords from source
2009-03-11 21:18:28 +0100 pl  r269355 : #i100134# change sft.h and ttcr.h to c++ headers
2009-03-11 20:19:15 +0100 pl  r269353 : #i100134# remove some ugly C style lists
2009-03-11 18:19:35 +0100 hdu  r269347 : #i100134# make psprint.fontsubset source C++ and make it compile
2009-03-11 14:44:35 +0100 hdu  r269334 : #i99862# fix justification of vocalized hebrew (thanks hennerdrewes)
2009-03-11 13:40:35 +0100 pl  r269327 : CWS-TOOLING: rebase CWS vcl100 to trunk@269297 (milestone: DEV300:m43)
2009-03-10 16:49:34 +0100 hdu  r269284 : #i1000020# add style-matching heuristics for single-char stylenames
2009-03-10 15:42:53 +0100 hdu  r269278 : use fast ASCII-matching for extracting attributes from PSName
2009-03-09 16:29:08 +0100 pl  r269200 : #i98980# skip bundles that are not NP plugins
2009-03-09 13:26:14 +0100 hdu  r269083 : #i99868# fix text breaking for large nCharExtra
2009-03-09 12:20:01 +0100 hdu  r269078 : #i99868# fix text breaking for large nCharExtra
2009-03-06 17:35:27 +0100 pl  r269032 : #i98980# mouse events
2009-03-06 17:10:14 +0100 pl  r269024 : #i98980# flash animations, initial paint problem
2009-03-05 20:00:21 +0100 pl  r268939 : #i98980# more plugin support
2009-03-05 15:35:06 +0100 pl  r268914 : #i98980# first twitches of a live plugin
2009-03-05 15:34:10 +0100 pl  r268913 : #i98980# access to carbon headers
2009-03-04 15:46:29 +0100 pl  r268839 : #i98980# generalize vcl SystemChildWindow from QTMovieView to NSView
2009-03-04 15:40:20 +0100 pl  r268838 : #i98980# generalize vcl SystemChildWindow from QTMovieView to NSView
2009-03-04 11:30:49 +0100 hdu  r268801 : #i99722# for OSX any anisotropy reported for the display resolution is best ignored
2009-03-02 15:52:21 +0100 pl  r268655 : #i99770# fix ambiguous looking if statements (thanks cmc)
2009-03-02 13:28:17 +0100 pl  r268649 : #i99770# fix ambiguous looking if statements (thanks cmc)
2009-02-27 15:39:30 +0100 pl  r268603 : #i97512# omit degenrate current matrix
2009-02-27 12:37:29 +0100 pl  r268579 : #i99716# remove unused code (thanks cmc)
2009-02-27 11:21:18 +0100 pl  r268569 : #i99705 remove unused code (thanks cmc)
2009-02-23 10:42:00 +0100 pl  r268345 : #i99492# remove a typo (thanks tono)
2009-02-19 12:46:21 +0100 pl  r268274 : #i99411# add new mimetype
2009-02-10 12:57:59 +0100 pl  r267548 : #i98980# more aqua plugin changes
2009-02-06 16:50:34 +0100 pl  r267475 : #i98980# plugin detection
2009-02-06 16:46:48 +0100 pl  r267474 : #i98980# make debug compilation work
2009-02-06 12:16:37 +0100 pl  r267449 : #98963# add missing wrapper
2009-02-04 20:06:59 +0100 pl  r267402 : #i97135# work around a gcc x64 optimizer bug
2009-02-04 13:45:36 +0100 pl  r267380 : #159153# do not emit empty glyph vector
2009-02-03 17:47:16 +0100 pl  r267338 : #i98533# recent gtk versions do not support GTK_MODULES for accessibility anymore
2009-02-03 10:39:46 +0100 pl  r267305 : #i97146# check if the idle formatted view is still valid
2009-01-28 11:23:23 +0100 pl  r267045 : #i42227# #i48965# refinement of check markings images
2009-01-27 19:40:01 +0100 pl  r267016 : #i42227# #i48965# change menus wrt checkmarks and images

3 files changed, 40 insertions, 12 deletions

diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index 820b053a4211..3bbdba5dad5f 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "sft.h"
+#include "sft.hxx"
 
 #include "tools/stream.hxx"
 #include "tools/vcompat.hxx"
@@ -43,6 +43,8 @@
 
 #include <algorithm>
 
+using namespace vcl;
+
 // =======================================================================
 
 DBG_NAME( Font )
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 0754f5c5b3dc..bf9e693d081c 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -6902,10 +6902,16 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const String& rText, bool bT
     if( aAlignOffset.X() || aAlignOffset.Y() )
         aAlignOffset = aRotScale.transform( aAlignOffset );
 
-    if( bVertical )
-        drawVerticalGlyphs( aGlyphs, aLine, aAlignOffset, aRotScale, fAngle, fXScale, fSkew, nFontHeight );
-    else
-        drawHorizontalGlyphs( aGlyphs, aLine, aAlignOffset, fAngle, fXScale, fSkew, nFontHeight, nPixelFontHeight );
+    /* #159153# do not emit an empty glyph vector; this can happen if e.g. the original
+       string contained only on of the UTF16 BOMs
+    */
+    if( ! aGlyphs.empty() )
+    {
+        if( bVertical )
+            drawVerticalGlyphs( aGlyphs, aLine, aAlignOffset, aRotScale, fAngle, fXScale, fSkew, nFontHeight );
+        else
+            drawHorizontalGlyphs( aGlyphs, aLine, aAlignOffset, fAngle, fXScale, fSkew, nFontHeight, nPixelFontHeight );
+    }
 
     // end textobject
     aLine.append( "ET\n" );
@@ -9297,14 +9303,24 @@ void PDFWriterImpl::drawJPGBitmap( SvStream& rDCTData, bool bIsTrueColor, const
         delete pStream;
 
     aLine.append( "q " );
-    m_aPages.back().appendMappedLength( (sal_Int32)rTargetArea.GetWidth(), aLine, false );
+    sal_Int32 nCheckWidth = 0;
+    m_aPages.back().appendMappedLength( (sal_Int32)rTargetArea.GetWidth(), aLine, false, &nCheckWidth );
     aLine.append( " 0 0 " );
-    m_aPages.back().appendMappedLength( (sal_Int32)rTargetArea.GetHeight(), aLine, true );
+    sal_Int32 nCheckHeight = 0;
+    m_aPages.back().appendMappedLength( (sal_Int32)rTargetArea.GetHeight(), aLine, true, &nCheckHeight );
     aLine.append( ' ' );
     m_aPages.back().appendPoint( rTargetArea.BottomLeft(), aLine );
     aLine.append( " cm\n/Im" );
     aLine.append( it->m_nObject );
     aLine.append( " Do Q\n" );
+    if( nCheckWidth == 0 || nCheckHeight == 0 )
+    {
+        // #i97512# avoid invalid current matrix
+        aLine.setLength( 0 );
+        aLine.append( "\n%jpeg image /Im" );
+        aLine.append( it->m_nObject );
+        aLine.append( " scaled to zero size, omitted\n" );
+    }
     writeBuffer( aLine.getStr(), aLine.getLength() );
 
     OStringBuffer aObjName( 16 );
@@ -9325,14 +9341,24 @@ void PDFWriterImpl::drawBitmap( const Point& rDestPoint, const Size& rDestSize,
         appendNonStrokingColor( rFillColor, aLine );
         aLine.append( ' ' );
     }
-    m_aPages.back().appendMappedLength( (sal_Int32)rDestSize.Width(), aLine, false );
+    sal_Int32 nCheckWidth = 0;
+    m_aPages.back().appendMappedLength( (sal_Int32)rDestSize.Width(), aLine, false, &nCheckWidth );
     aLine.append( " 0 0 " );
-    m_aPages.back().appendMappedLength( (sal_Int32)rDestSize.Height(), aLine, true );
+    sal_Int32 nCheckHeight = 0;
+    m_aPages.back().appendMappedLength( (sal_Int32)rDestSize.Height(), aLine, true, &nCheckHeight );
     aLine.append( ' ' );
     m_aPages.back().appendPoint( rDestPoint + Point( 0, rDestSize.Height()-1 ), aLine );
     aLine.append( " cm\n/Im" );
     aLine.append( rBitmap.m_nObject );
     aLine.append( " Do Q\n" );
+    if( nCheckWidth == 0 || nCheckHeight == 0 )
+    {
+        // #i97512# avoid invalid current matrix
+        aLine.setLength( 0 );
+        aLine.append( "\n%bitmap image /Im" );
+        aLine.append( rBitmap.m_nObject );
+        aLine.append( " scaled to zero size, omitted\n" );
+    }
     writeBuffer( aLine.getStr(), aLine.getLength() );
 }
 
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 0358b25ca153..a96d4dc64b89 100755
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1292,10 +1292,10 @@ void GenericSalLayout::ApplyAsianKerning( const sal_Unicode* pStr, int nLength )
         {
             // ignore code ranges that are not affected by asian punctuation compression
             const sal_Unicode cHere = pStr[n];
-            if( (0x3000 != (cHere & 0xFF00)) && (0x2010 != (cHere & 0xFFF0)) || (0xFF00 != (cHere & 0xFF00)) )
+            if( ((0x3000 != (cHere & 0xFF00)) && (0x2010 != (cHere & 0xFFF0))) || (0xFF00 != (cHere & 0xFF00)) )
                 continue;
             const sal_Unicode cNext = pStr[n+1];
-            if( (0x3000 != (cNext & 0xFF00)) && (0x2010 != (cNext & 0xFFF0)) || (0xFF00 != (cNext & 0xFF00)) )
+            if( ((0x3000 != (cNext & 0xFF00)) && (0x2010 != (cNext & 0xFFF0))) || (0xFF00 != (cNext & 0xFF00)) )
                 continue;
 
             // calculate compression values
@@ -1773,7 +1773,7 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
     int nStartNew[ MAX_FALLBACK ];
     int nCharPos[ MAX_FALLBACK ];
     sal_Int32 nGlyphAdv[ MAX_FALLBACK ];
-    int nValid[ MAX_FALLBACK ];
+    int nValid[ MAX_FALLBACK ] = {0};
 
     sal_GlyphId nDummy;
     Point aPos;