diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-01-11 19:51:54 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-01-12 15:08:36 +0100 |
| commit | be30c734bf420f9dd890906c84d2b4460385a2ba (patch) | |
| tree | 5b6219b8f666e0493ad5961bdca7b132f63b3d85 /vcl/inc | |
| parent | 9a850dd9f3c221660b6259bdfd64a77343f2256c (diff) | |
keep positions as DeviceCoordinate within SalLayout
Change-Id: I20bbb0e252ffd09901f587599430e715dbe977b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128300
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/impglyphitem.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/sallayout.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/inc/impglyphitem.hxx b/vcl/inc/impglyphitem.hxx index b33ccbd37d7c..bb981d011a8d 100644 --- a/vcl/inc/impglyphitem.hxx +++ b/vcl/inc/impglyphitem.hxx @@ -58,10 +58,10 @@ class VCL_DLLPUBLIC GlyphItem GlyphItemFlags m_nFlags; public: - Point m_aLinearPos; // absolute position of non rotated string + DevicePoint m_aLinearPos; // absolute position of non rotated string sal_Int32 m_nNewWidth; // width after adjustments - GlyphItem(int nCharPos, int nCharCount, sal_GlyphId aGlyphId, const Point& rLinearPos, + GlyphItem(int nCharPos, int nCharCount, sal_GlyphId aGlyphId, const DevicePoint& rLinearPos, GlyphItemFlags nFlags, int nOrigWidth, int nXOffset) : m_nOrigWidth(nOrigWidth) , m_nCharPos(nCharPos) diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index ab29a2022985..acd49edfda30 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -64,7 +64,7 @@ public: sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra, int nFactor) const override; DeviceCoordinate FillDXArray(std::vector<DeviceCoordinate>* pDXArray) const override; void GetCaretPositions(int nArraySize, sal_Int32* pCaretXArray) const override; - bool GetNextGlyph(const GlyphItem** pGlyph, Point& rPos, int& nStart, + bool GetNextGlyph(const GlyphItem** pGlyph, DevicePoint& rPos, int& nStart, const LogicalFontInstance** ppGlyphFont = nullptr, const vcl::font::PhysicalFontFace** pFallbackFont = nullptr) const override; bool GetOutline(basegfx::B2DPolyPolygonVector&) const override; @@ -121,7 +121,7 @@ public: LogicalFontInstance& GetFont() const { return *m_GlyphItems.GetFont(); } - bool GetNextGlyph(const GlyphItem** pGlyph, Point& rPos, int& nStart, + bool GetNextGlyph(const GlyphItem** pGlyph, DevicePoint& rPos, int& nStart, const LogicalFontInstance** ppGlyphFont = nullptr, const vcl::font::PhysicalFontFace** pFallbackFont = nullptr) const override; |