1 files changed, 0 insertions, 128 deletions

diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 39964f635c9c..9884e7016fee 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -391,11 +391,9 @@ public:
     // used by charstring converter
     void    setCharStringType( int);
     void    fakeLocalSubrCount( int nLocalSubrs ) { maCffLocal[0].mnLocalSubrCount=nLocalSubrs;}
-    void    readCharString( const U8* pTypeOps, int nTypeLen);
 protected:
     int     convert2Type1Ops( CffLocal*, const U8* pType2Ops, int nType2Len, U8* pType1Ops);
 private:
-    void    readTypeOp( CffSubsetterContext&);
     void    convertOneTypeOp( void);
     void    convertOneTypeEsc( void);
     void    callType2Subr( bool bGlobal, int nSubrNumber);
@@ -431,7 +429,6 @@ private:
     int         getGlyphSID( int nGlyphIndex) const;
     const char* getGlyphName( int nGlyphIndex);
 
-    void    readTypeOp( void);
     void    read2push( void);
     void    pop2write( void);
     void    writeType1Val( ValType);
@@ -611,25 +608,6 @@ void CffSubsetterContext::setCharStringType( int nVal)
 
 // --------------------------------------------------------------------
 
-void CffSubsetterContext::readCharString( const U8* pTypeOps, int nTypeLen)
-{
-    mnStackIdx = 0;
-    mnHintSize = 0;
-    mnHorzHintSize = 0;
-    maCharWidth = -1;
-
-    assert( nTypeLen >= 0);
-//  assert( nEnd <= getLength());
-    mpReadPtr = pTypeOps;
-    mpReadEnd = mpReadPtr + nTypeLen;
-    // reset the execution context
-    while( mpReadPtr < mpReadEnd)
-        readTypeOp();
-//###   assert( tellRel() == nEnd);
-}
-
-// --------------------------------------------------------------------
-
 void CffSubsetterContext::readDictOp( void)
 {
     ValType nVal = 0;
@@ -765,112 +743,6 @@ void CffSubsetterContext::readDictOp( void)
 
 // --------------------------------------------------------------------
 
-void CffSubsetterContext::readTypeOp( void)
-{
-    int nVal = 0;
-    const U8 c = *mpReadPtr;
-    if( (c <= 31) && (c != 28) ) {
-        const int nOpId = *(mpReadPtr++);
-        const char* pCmdName;
-        if( nOpId != 12)
-            pCmdName = mpCharStringOps[ nOpId];
-        else {
-            const int nExtId = *(mpReadPtr++);
-            pCmdName = mpCharStringEscs[ nExtId];
-        }
-
-        if( !pCmdName )
-            pCmdName = ".NULL";
-        // handle typeop parameters
-        int nMinStack = -1, nMaxStack = -1;
-        switch( *pCmdName) {
-        default: fprintf( stderr, "unsupported TypeOp.type=\'%c\'\n", *pCmdName); break;
-        case '.': nMinStack = 0; nMaxStack = 999; break;
-        case '0': nMinStack = nMaxStack = 0; break;
-        case '1': nMinStack = nMaxStack = 1; break;
-        case '2': nMinStack = nMaxStack = 2; break;
-        case '4': nMinStack = nMaxStack = 4; break;
-        case '5': nMinStack = nMaxStack = 5; break; // not used for Type2 ops
-        case '6': nMinStack = nMaxStack = 6; break;
-        case '7': nMinStack = nMaxStack = 7; break;
-        case '9': nMinStack = nMaxStack = 9; break;
-        case 'f': nMinStack = nMaxStack = 11; break;
-        case 'F': nMinStack = nMaxStack = 13; break;
-        case 'A': nMinStack = 2; nMaxStack = 999; break;
-        case 'C': nMinStack = 6; nMaxStack = 999; break;
-        case 'E': nMinStack = 1; nMaxStack = 999; break;
-        case 'G': nMinStack = 1; nMaxStack = 999; // global subr
-            nVal = peekInt();
-            // TODO global subr
-            break;
-        case 'L':   // local subr
-            nMinStack = 1; nMaxStack = 999;
-            nVal = peekInt();
-            // TODO local subr
-            break;
-        case 'I':   // operands for "index"
-#if 0
-            nMinStack = nValStack[ nStackIdx-1];
-            if( nMinStack < 0) nMinStack = 0;
-            nMinStack += 1;
-#else
-            fprintf( stderr, "TODO: Iindex op\n");
-#endif
-            break;
-        case 'R':   // operands for "rol"
-#if 0
-            nMinStack = nValStack[ nStackIdx-2];
-#else
-            fprintf( stderr, "TODO: Rrol op\n");
-#endif
-        case 'X':   // operands for "return"
-            nMinStack = 0;
-            nMaxStack = /*### (!bInSubrs)? 0 :###*/999;
-            break;
-        case 'H':   // "hstemhm"
-        case 'h':   // "hstem"
-            addHints( false);
-            nMinStack = nMaxStack = 0;
-            break;
-        case 'V':   // "vstemhm"
-        case 'v':   // "vstem"
-            addHints( true);
-            nMinStack = nMaxStack = 0;
-            break;
-        case 'K':   // "hintmask" or "cntrmask"
-            addHints( true);    // implicit vstemhm
-            nMinStack = nMaxStack = 0;
-            break;
-        case 'e':   // endchar
-            updateWidth( (size() >= 1) && (size() != 4));
-            nMinStack = nMaxStack = 0;
-            if( size() == 4)
-                fprintf( stderr,"Deprecated SEAC-like endchar is not supported for CFF subsetting!\n"); // TODO: handle deprecated op
-            break;
-        case 'm':   // hmoveto or vmoveto
-            updateWidth( size() > 1);
-            nMinStack = 1;
-            nMaxStack = nMinStack;
-            break;
-        case 'M':   // rmoveto
-            updateWidth( size() > 2);
-            nMinStack = 2;
-            nMaxStack = nMinStack;
-            break;
-        }
-
-        clear();
-        return;
-    }
-
-    if( (c >= 32) || (c == 28)) {
-//      --mpReadPtr;
-        read2push();
-    }
-}
-
-// --------------------------------------------------------------------
-
 void CffSubsetterContext::read2push()
 {
     ValType aVal = 0;