CWS-TOOLING: integrate CWS ooo32gsl01

2009-10-13 15:59:25 +0200 hdu  r276868 : #i100000# fix remaining merge conflict
2009-10-12 16:08:38 +0200 hdu  r276837 : CWS-TOOLING: rebase CWS ooo32gsl01 to branches/OOO320@276773 (milestone: OOO320:m1)
2009-09-15 10:09:52 +0200 hdu  r276150 : #i104861# adjust metrics to pseudo-emUnits==1000 expectation
for better precision allow non-integer charwidth/stemwidth
2009-09-15 09:58:00 +0200 hdu  r276149 : #i104861# prepare to fix by updating cff.cxx to latest version from CWS vcl105
2009-09-14 16:06:46 +0200 hdu  r276130 : #i104221# treat judeo-spanish varika as diacritic also in problematic fonts (thanks yoramg)
2009-09-14 15:27:14 +0200 hdu  r276126 : #i104221# fix regression with he/ar diacritics
2009-09-10 15:39:58 +0200 aw  r276038 : #i104867# added a GraphicVersion number to EmbeddedObjectRef to allow Grahic chamge checks without fetching the graphic
2009-09-10 15:38:41 +0200 aw  r276037 : #i104867# added GraphicVersionNumber to SdrOleContentPrimitive to detect OLE content change without getting the Graphic
2009-09-09 17:16:43 +0200 hdu  r276006 : #i104886# Aqua: fix for 101491 only applies to non-hairlines
2009-09-09 16:39:05 +0200 hdu  r276002 : #i99849# don't give up on ScriptItemize too early

4 files changed, 56 insertions, 41 deletions

diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index e0905fe1d377..f389abd19a82 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -966,13 +966,15 @@ bool AquaSalGraphics::drawPolyLine( const ::basegfx::B2DPolygon& rPolyLine,
     if( nPointCount <= 0 )
         return true;
 
-    // reject strange requests
+    // reject requests that cannot be handled yet
     if( rLineWidths.getX() != rLineWidths.getY() )
         return false;
 
     // #i101491# Aqua does not support B2DLINEJOIN_NONE; return false to use
     // the fallback (own geometry preparation)
-    if(basegfx::B2DLINEJOIN_NONE == eLineJoin)
+    // #i104886# linejoin-mode and thus the above only applies to "fat" lines
+    if( (basegfx::B2DLINEJOIN_NONE == eLineJoin)
+    && (rLineWidths.getX() > 1.3) )
         return false;
 
     // setup line attributes
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index e5d83dc0733a..dd198ff521db 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -332,12 +332,13 @@ struct CffLocal
     int     mnLocalSubrBase;
     int     mnLocalSubrCount;
     int     mnLocalSubrBias;
-    int     mnNominalWidth;
-    int     mnDefaultWidth;
+
+    ValType maNominalWidth;
+    ValType maDefaultWidth;
 
     // ATM hinting related values
-    int         mnStemStdHW;
-    int         mnStemStdVW;
+    ValType     maStemStdHW;
+    ValType     maStemStdVW;
     ValVector   maStemSnapH;
     ValVector   maStemSnapV;
     ValVector   maBlueValues;
@@ -461,10 +462,10 @@ public: // TODO: is public really needed?
     void    getHintPair( int nIndex, ValType* nMin, ValType* nEnd) const;
 
     // accessing other charstring specifics
-    bool    hasCharWidth( void) const { return (mnCharWidth != -1);}
-    int     getCharWidth( void) const { return mnCharWidth;}
-    void    setNominalWidth( int nWidth) { mpCffLocal->mnNominalWidth = nWidth;}
-    void    setDefaultWidth( int nWidth) { mpCffLocal->mnDefaultWidth = nWidth;}
+    bool    hasCharWidth( void) const { return (maCharWidth > 0);}
+    ValType getCharWidth( void) const { return maCharWidth;}
+    void    setNominalWidth( ValType aWidth) { mpCffLocal->maNominalWidth = aWidth;}
+    void    setDefaultWidth( ValType aWidth) { mpCffLocal->maDefaultWidth = aWidth;}
     void    updateWidth( bool bUseFirstVal);
 
 private:
@@ -477,7 +478,7 @@ private:
     int mnHorzHintSize;
     ValType mnHintStack[ NMAXHINTS];
 
-    int mnCharWidth;
+    ValType maCharWidth;
 };
 
 // --------------------------------------------------------------------
@@ -488,7 +489,7 @@ CffSubsetterContext::CffSubsetterContext( const U8* pBasePtr, int nBaseLen)
 ,   mnStackIdx(0)
 ,   mnHintSize(0)
 ,   mnHorzHintSize(0)
-,   mnCharWidth(-1)
+,   maCharWidth(-1)
 {
 //  setCharStringType( 1);
     // TODO: new CffLocal[ mnFDAryCount];
@@ -542,13 +543,13 @@ inline void CffSubsetterContext::updateWidth( bool bUseFirstVal)
         return;
 #endif
     if( bUseFirstVal) {
-        mnCharWidth = static_cast<int>(mpCffLocal->mnNominalWidth + mnValStack[0]);
+        maCharWidth = mpCffLocal->maNominalWidth + mnValStack[0];
         // remove bottom stack entry
         --mnStackIdx;
         for( int i = 0; i < mnStackIdx; ++i)
             mnValStack[ i] = mnValStack[ i+1];
     } else {
-        mnCharWidth = mpCffLocal->mnDefaultWidth;
+        maCharWidth = mpCffLocal->maDefaultWidth;
     }
 }
 
@@ -615,7 +616,7 @@ void CffSubsetterContext::readCharString( const U8* pTypeOps, int nTypeLen)
     mnStackIdx = 0;
     mnHintSize = 0;
     mnHorzHintSize = 0;
-    mnCharWidth = -1;
+    maCharWidth = -1;
 
     assert( nTypeLen >= 0);
 //  assert( nEnd <= getLength());
@@ -659,14 +660,14 @@ void CffSubsetterContext::readDictOp( void)
             nVal = popVal();
             nInt = static_cast<int>(nVal);
             switch( nOpId) {
-            case  10: mpCffLocal->mnStemStdHW = nInt;  break;   // "StdHW"
-            case  11: mpCffLocal->mnStemStdVW = nInt; break;    // "StdVW"
+            case  10: mpCffLocal->maStemStdHW = nVal; break;    // "StdHW"
+            case  11: mpCffLocal->maStemStdVW = nVal; break;    // "StdVW"
             case  15: mnCharsetBase = nInt; break;              // "charset"
             case  16: mnEncodingBase = nInt; break;             // "nEncoding"
             case  17: mnCharStrBase = nInt; break;              // "nCharStrings"
             case  19: mpCffLocal->mnLocalSubrOffs = nInt; break;// "nSubrs"
-            case  20: setDefaultWidth( nInt ); break;           // "defaultWidthX"
-            case  21: setNominalWidth( nInt ); break;           // "nominalWidthX"
+            case  20: setDefaultWidth( nVal ); break;           // "defaultWidthX"
+            case  21: setNominalWidth( nVal ); break;           // "nominalWidthX"
             case 909: mpCffLocal->mfBlueScale = nVal; break;    // "BlueScale"
             case 910: mpCffLocal->mfBlueShift = nVal; break;    // "BlueShift"
             case 911: mpCffLocal->mfBlueFuzz = nVal; break;     // "BlueFuzz"
@@ -1477,7 +1478,7 @@ int CffSubsetterContext::convert2Type1Ops( CffLocal* pCffLocal, const U8* const
 mbSawError = false;
 mbNeedClose = false;
 mbIgnoreHints = false;
-mnHintSize=mnHorzHintSize=mnStackIdx=0; mnCharWidth=-1;//#######
+mnHintSize=mnHorzHintSize=mnStackIdx=0; maCharWidth=-1;//#######
 mnCntrMask = 0;
     while( mpReadPtr < mpReadEnd)
         convertOneTypeOp();
@@ -1673,10 +1674,10 @@ CffLocal::CffLocal( void)
 ,   mnLocalSubrBase( 0)
 ,   mnLocalSubrCount( 0)
 ,   mnLocalSubrBias( 0)
-,   mnNominalWidth( 0)
-,   mnDefaultWidth( 0)
-,   mnStemStdHW( 0)
-,   mnStemStdVW( 0)
+,   maNominalWidth( 0)
+,   maDefaultWidth( 0)
+,   maStemStdHW( 0)
+,   maStemStdVW( 0)
 ,   mfBlueScale( 0.0)
 ,   mfBlueShift( 0.0)
 ,   mfBlueFuzz( 0.0)
@@ -2296,8 +2297,8 @@ bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
     nPrivEntryCount += (mpCffLocal->mfBlueShift != 0.0);
     nPrivEntryCount += (mpCffLocal->mfBlueFuzz != 0.0);
     // emit stem hints only if non-default values
-    nPrivEntryCount += (mpCffLocal->mnStemStdHW != 0);
-    nPrivEntryCount += (mpCffLocal->mnStemStdVW != 0);
+    nPrivEntryCount += (mpCffLocal->maStemStdHW != 0);
+    nPrivEntryCount += (mpCffLocal->maStemStdVW != 0);
     nPrivEntryCount += !mpCffLocal->maStemSnapH.empty();
     nPrivEntryCount += !mpCffLocal->maStemSnapV.empty();
     // emit other hints only if non-default values
@@ -2337,10 +2338,10 @@ bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
         pOut += sprintf( pOut, "/BlueFuzz %.1f def\n", mpCffLocal->mfBlueFuzz);
 
     // emit stem hint related privdict entries
-    if( mpCffLocal->mnStemStdHW)
-        pOut += sprintf( pOut, "/StdHW [%d] def\n", mpCffLocal->mnStemStdHW);
-    if( mpCffLocal->mnStemStdVW)
-        pOut += sprintf( pOut, "/StdVW [%d] def\n", mpCffLocal->mnStemStdVW);
+    if( mpCffLocal->maStemStdHW)
+        pOut += sprintf( pOut, "/StdHW [%g] def\n", mpCffLocal->maStemStdHW);
+    if( mpCffLocal->maStemStdVW)
+        pOut += sprintf( pOut, "/StdVW [%g] def\n", mpCffLocal->maStemStdVW);
     rEmitter.emitValVector( "/StemSnapH [", "]ND\n", mpCffLocal->maStemSnapH);
     rEmitter.emitValVector( "/StemSnapV [", "]ND\n", mpCffLocal->maStemSnapV);
 
@@ -2413,8 +2414,12 @@ bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
         pOut += sprintf( pOut, " ND\n");
         rEmitter.emitAllCrypted();
         // provide individual glyphwidths if requested
-        if( pGlyphWidths )
-            pGlyphWidths[i] = getCharWidth();
+        if( pGlyphWidths ) {
+            ValType aCharWidth = getCharWidth();
+            if( maFontMatrix.size() >= 4)
+                aCharWidth *= 1000.0F * maFontMatrix[0];
+            pGlyphWidths[i] = static_cast<GlyphWidth>(aCharWidth);
+        }
     }
     pOut += sprintf( pOut, "end end\nreadonly put\nput\n");
     pOut += sprintf( pOut, "dup/FontName get exch definefont pop\n");
@@ -2446,8 +2451,17 @@ bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
 
     // provide details to the subset requesters, TODO: move into own method?
     // note: Top and Bottom are flipped between Type1 and VCL
-    rFSInfo.m_aFontBBox = Rectangle( Point( static_cast<long>(maFontBBox[0]), static_cast<long>(maFontBBox[1]) ),
-                                     Point( static_cast<long>(maFontBBox[2]), static_cast<long>(maFontBBox[3]) ) );
+    // note: the rest of VCL expects the details below to be scaled like for an emUnits==1000 font
+    ValType fXFactor = 1.0;
+    ValType fYFactor = 1.0;
+    if( maFontMatrix.size() >= 4) {
+        fXFactor = 1000.0F * maFontMatrix[0];
+        fYFactor = 1000.0F * maFontMatrix[3];
+    }
+    rFSInfo.m_aFontBBox = Rectangle( Point( static_cast<long>(maFontBBox[0] * fXFactor),
+                                        static_cast<long>(maFontBBox[1] * fYFactor) ),
+                                    Point( static_cast<long>(maFontBBox[2] * fXFactor),
+                                        static_cast<long>(maFontBBox[3] * fYFactor) ) );
     // PDF-Spec says the values below mean the ink bounds!
     // TODO: use better approximations for these ink bounds
     rFSInfo.m_nAscent  = +rFSInfo.m_aFontBBox.Bottom(); // for capital letters
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 21ac05a498fc..1f44b823ce44 100755
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -95,11 +95,12 @@ bool IsDiacritic( sal_UCS4 nChar )
      if( nChar >= 0x2100 )
         return false;
 
+    // TODO: #i105058# use icu uchar.h's character classification instead of the handcrafted table
     struct DiaRange { sal_UCS4 mnMin, mnEnd;};
     static const DiaRange aRanges[] = {
         {0x0300, 0x0370},
-        {0x0590, 0x05C0}, {0x05C1, 0x05C3}, {0x05C3, 0x05C6}, {0x05C7, 0x05C8},
-        {0x0610, 0x061B}, {0x064B, 0x0660}, {0x0670, 0x0671}, {0x06D6, 0x06DC}, {0x06DF, 0x06EE},
+        {0x0590, 0x05BE}, {0x05BF, 0x05C0}, {0x05C1, 0x05C3}, {0x05C4, 0x05C6}, {0x05C7, 0x05C8},
+        {0x0610, 0x061B}, {0x064B, 0x0660}, {0x0670, 0x0671}, {0x06D6, 0x06DD}, {0x06DF, 0x06E5}, {0x06E7, 0x06E9}, {0x06EA,0x06EF},
         {0x0730, 0x074D}, {0x07A6, 0x07B1}, {0x07EB, 0x07F4},
 #if 0 // all known fonts have zero-width diacritics already, so no need to query it
         {0x0900, 0x0904}, {0x093C, 0x093D}, {0x0941, 0x0948}, {0x094D, 0x0950}, {0x0951, 0x0958},
@@ -107,7 +108,8 @@ bool IsDiacritic( sal_UCS4 nChar )
         {0x0A00, 0x0A05}, {0x0A3C, 0x0A59}, //...
 #endif
         {0x1DC0, 0x1E00},
-        {0x205F, 0x2070}, {0x20D0, 0x2100}
+        {0x205F, 0x2070}, {0x20D0, 0x2100},
+        {0xFB1E, 0xFB1F}
     };
 
     // TODO: almost anything is faster than an O(n) search
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 1b80bf578530..bf56b2a1082b 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: winlayout.cxx,v $
- * $Revision: 1.113.6.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1385,7 +1382,7 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs )
         mpScriptItems = NULL;
         if( nRC != E_OUTOFMEMORY )
             return false;
-        if( nItemCapacity > (nSubStringEnd - mnSubStringMin) )
+        if( nItemCapacity > (nSubStringEnd - mnSubStringMin) + 16 )
             return false;
     }