Commits

Anonymous committed 0ea68c0

tmp_otf02: #i112466#: mpScript renamed to mpScriptTags

  • Participants
  • Parent commits 54d61ca

Comments (0)

Files changed (1)

vcl/win/source/gdi/winlayout.cxx

     VisualItem*     mpVisualItems;      // in visual order
     int             mnItemCount;        // number of visual items
 
-    OPENTYPE_TAG*   mpScript;            // item script
+    OPENTYPE_TAG*   mpScriptTags;       // item script
     OPENTYPE_FEATURE_RECORD* mpOFR;
 
     // string specific info
     mpGlyphs2Chars( NULL ),
     mnMinKashidaGlyph( 0 ),
     mbDisableGlyphInjection( false ),
-
+    mpScriptTags( NULL ),
     mpGlyphProp( NULL ),
     mpCharProp( NULL )
 {}
     delete[] mpGlyphOffsets;
     delete[] mpGlyphs2Chars;
 
-    delete[] mpScript;
+    delete[] mpScriptTags;
     delete[] mpCharProp;
     delete[] mpGlyphProp;
     delete[] mpOFR;
     // now itemize the substring with its context
     for( int nItemCapacity = 16;; nItemCapacity *= 8 )
     {
-        mpScript = new OPENTYPE_TAG[ nItemCapacity ];
+        mpScriptTags = new OPENTYPE_TAG[ nItemCapacity ];
         mpScriptItems = new SCRIPT_ITEM[ nItemCapacity ];
 
         HRESULT nRC;
              nRC = (*pScriptItemizeOpenType)(
                 reinterpret_cast<LPCWSTR>(rArgs.mpStr + mnSubStringMin), nSubStringEnd - mnSubStringMin,
                 nItemCapacity - 1, &aScriptControl, &aScriptState,
-                mpScriptItems, mpScript, &mnItemCount );
+                mpScriptItems, mpScriptTags, &mnItemCount );
         else
             nRC = (*pScriptItemize)(
                 reinterpret_cast<LPCWSTR>(rArgs.mpStr + mnSubStringMin), nSubStringEnd - mnSubStringMin,
             break;
 
         // prepare bigger buffers for another itemization round
-        delete[] mpScript;
-        mpScript = NULL;
+        delete[] mpScriptTags;
+        mpScriptTags = NULL;
         delete[] mpScriptItems;
         mpScriptItems = NULL;
         if( nRC != E_OUTOFMEMORY )
                 mhDC,
                 &rScriptCache,
                 &rVisualItem.mpScriptItem->a,
-                mpScript[nItem],
+                mpScriptTags[nItem],
                 0,
                 &ranges[0],
                 &pTTP,
         if (bNewUsp)
             nRC = (*pScriptPlaceOpenType)( mhDC, &rScriptCache,
                 &rVisualItem.mpScriptItem->a,
-                mpScript[nItem],
+                mpScriptTags[nItem],
                 0,
                 &ranges[0],
                 &pTTP,