diff options
Diffstat (limited to 'vcl/inc/win')
| -rw-r--r-- | vcl/inc/win/salgdi.h | 33 | ||||
| -rw-r--r-- | vcl/inc/win/winlayout.hxx | 59 |
2 files changed, 0 insertions, 92 deletions
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 305005540841..5e1978c892f3 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -33,11 +33,6 @@ #include <memory> #include <unordered_set> -#include <config_graphite.h> -#if ENABLE_GRAPHITE -# include <graphite_static.hxx> -# include <graphite2/Font.h> -#endif #ifndef INCLUDED_PRE_POST_WIN_H #define INCLUDED_PRE_POST_WIN_H # include "prewin.h" @@ -60,26 +55,6 @@ class CommonSalLayout; #define RGB_TO_PALRGB(nRGB) ((nRGB)|0x02000000) #define PALRGB_TO_RGB(nPalRGB) ((nPalRGB)&0x00ffffff) -#if ENABLE_GRAPHITE -class RawFontData; -class GrFontData -{ -public: - GrFontData(HDC hDC); - ~GrFontData(); - const void * getTable(unsigned int name, size_t *len) const; - const gr_face * getFace() const { return mpFace; } - void AddReference() { ++mnRefCount; } - void DeReference() { if (--mnRefCount == 0) delete this; } -private: - GrFontData(GrFontData &) {}; - HDC mhDC; - mutable std::vector<RawFontData*> mvData; - gr_face * mpFace; - unsigned int mnRefCount; -}; -#endif - // win32 specific physically available font face class WinFontFace : public PhysicalFontFace { @@ -101,10 +76,6 @@ public: BYTE GetPitchAndFamily() const { return mnPitchAndFamily; } bool SupportsCJK() const { return mbHasCJKSupport; } bool SupportsArabic() const { return mbHasArabicSupport; } -#if ENABLE_GRAPHITE - bool SupportsGraphite() const { return mbHasGraphiteSupport; } - const gr_face* GraphiteFace() const; -#endif FontCharMapRef GetFontCharMap() const; bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const; @@ -120,10 +91,6 @@ private: // some members that are initalized lazily when the font gets selected into a HDC mutable bool mbHasCJKSupport; -#if ENABLE_GRAPHITE - mutable GrFontData* mpGraphiteData; - mutable bool mbHasGraphiteSupport; -#endif mutable bool mbHasArabicSupport; mutable bool mbFontCapabilitiesRead; mutable FontCharMapRef mxUnicodeMap; diff --git a/vcl/inc/win/winlayout.hxx b/vcl/inc/win/winlayout.hxx index 7b15e7e4f5f3..ff57506420a0 100644 --- a/vcl/inc/win/winlayout.hxx +++ b/vcl/inc/win/winlayout.hxx @@ -34,14 +34,6 @@ typedef std::unordered_map<int,int> IntMap; -// Graphite headers -#include <config_graphite.h> -#if ENABLE_GRAPHITE -#include <graphite_layout.hxx> -#include <i18nlangtag/languagetag.hxx> -#include <graphite_features.hxx> -#endif - class WinFontInstance; struct VisualItem; @@ -350,57 +342,6 @@ private: bool mbDisableGlyphInjection; }; -#if ENABLE_GRAPHITE - -class GraphiteLayoutWinImpl : public GraphiteLayout -{ -public: - GraphiteLayoutWinImpl(const gr_face * pFace, WinFontInstance & rFont) - throw() - : GraphiteLayout(pFace), mrFont(rFont) {}; - virtual ~GraphiteLayoutWinImpl() throw() override {}; - virtual sal_GlyphId getKashidaGlyph(int & rWidth) override; -private: - WinFontInstance & mrFont; -}; - -/// This class uses the SIL Graphite engine to provide complex text layout services to the VCL -class GraphiteWinLayout : public WinLayout -{ -private: - gr_font * mpFont; - grutils::GrFeatureParser * mpFeatures; - mutable GraphiteLayoutWinImpl maImpl; -public: - GraphiteWinLayout(HDC hDC, const WinFontFace& rWFD, WinFontInstance& rWFE, bool bUseOpenGL) throw(); - virtual ~GraphiteWinLayout() override; - - // used by upper layers - virtual bool LayoutText( ImplLayoutArgs& ) override; // first step of layout - virtual void AdjustLayout( ImplLayoutArgs& ) override; // adjusting after fallback etc. - virtual bool DrawTextImpl(HDC hDC, const Rectangle* pRectToErase, Point* pPos, int* pGetNextGlypInfo) const override; - virtual bool CacheGlyphs(SalGraphics& rGraphics) const override; - virtual bool DrawCachedGlyphs(SalGraphics& rGraphics) const override; - - // methods using string indexing - virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra, int nFactor) const override; - virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const override; - - virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const override; - - // methods using glyph indexing - virtual int GetNextGlyphs(int nLen, sal_GlyphId* pGlyphIdxAry, ::Point & rPos, int&, - DeviceCoordinate* pGlyphAdvAry = nullptr, int* pCharPosAry = nullptr, - const PhysicalFontFace** pFallbackFonts = nullptr ) const override; - - // used by glyph+font+script fallback - virtual void MoveGlyph( int nStart, long nNewXPos ) override; - virtual void DropGlyph( int nStart ) override; - virtual void Simplify( bool bIsBase ) override; -}; - -#endif // ENABLE_GRAPHITE - class TextOutRenderer { protected: |