diff options
author | Tor Lillqvist <tml@collabora.com> | 2015-08-12 08:18:50 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2015-08-12 09:14:20 +0300 |
commit | 4667db065d34193d99bce82f7e8f3b20a03ecade (patch) | |
tree | 405ac0a286040b8a983701f167c583c45691685b /vcl/win/source/gdi/winlayout.hxx | |
parent | 695cec87d73d56617e1cdc62621971ab35ac67eb (diff) |
Drop SimpleWinLayout
Use Uniscribe also for non-complex text. It is complicated enough to
have separate Graphite and Uniscribe layout engines. Will make further
changes to the code easier to manage, especially as with the
UniscribeLayout code we have access to the actual
glyphs. (Cf. 3e47219e06b9a279ba22a9bbef668731f2d3e07d)
Change-Id: I9c67c172fe3e3d26d1c6cb1c0b7f1516b0b87f12
Diffstat (limited to 'vcl/win/source/gdi/winlayout.hxx')
-rw-r--r-- | vcl/win/source/gdi/winlayout.hxx | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/vcl/win/source/gdi/winlayout.hxx b/vcl/win/source/gdi/winlayout.hxx index 7e135ae3504e..7819eae076fa 100644 --- a/vcl/win/source/gdi/winlayout.hxx +++ b/vcl/win/source/gdi/winlayout.hxx @@ -65,49 +65,6 @@ protected: ImplWinFontEntry& mrWinFontEntry; }; -class SimpleWinLayout : public WinLayout -{ -public: - SimpleWinLayout(HDC, BYTE nCharSet, const ImplWinFontData&, ImplWinFontEntry&, bool bUseOpenGL); - virtual ~SimpleWinLayout(); - - virtual bool LayoutText( ImplLayoutArgs& ) SAL_OVERRIDE; - virtual void AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE; - virtual void DrawTextImpl(HDC hDC) const SAL_OVERRIDE; - - virtual int GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos, int&, - DeviceCoordinate* pGlyphAdvances, int* pCharIndexes, - const PhysicalFontFace** pFallbackFonts = NULL ) const SAL_OVERRIDE; - - virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const SAL_OVERRIDE; - virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra, int nFactor) const SAL_OVERRIDE; - virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const SAL_OVERRIDE; - - // for glyph+font+script fallback - virtual void MoveGlyph( int nStart, long nNewXPos ) SAL_OVERRIDE; - virtual void DropGlyph( int nStart ) SAL_OVERRIDE; - virtual void Simplify( bool bIsBase ) SAL_OVERRIDE; - -protected: - void Justify( DeviceCoordinate nNewWidth ); - void ApplyDXArray( const ImplLayoutArgs& ); - -private: - int mnGlyphCount; - int mnCharCount; - WCHAR* mpOutGlyphs; - int* mpGlyphAdvances; // if possible this is shared with mpGlyphAdvances[] - int* mpGlyphOrigAdvs; - int* mpCharWidths; // map rel char pos to char width - int* mpChars2Glyphs; // map rel char pos to abs glyph pos - int* mpGlyphs2Chars; // map abs glyph pos to abs char pos - bool* mpGlyphRTLFlags; // BiDi status for glyphs: true=>RTL - mutable long mnWidth; - - int mnNotdefWidth; - BYTE mnCharSet; -}; - class UniscribeLayout : public WinLayout { public: |