diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2018-05-10 13:34:13 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2018-05-12 15:29:33 +0200 |
| commit | 4680ce8790e1a3bd7da6800f4feb4e3a70aaa088 (patch) | |
| tree | b20d317a6a8a72a30884fb2d2f0c83490d1420f3 | |
| parent | a17c2018a4587046c8f2328581eb227b4c1bd422 (diff) | |
Drop trivial, used only once, functions
Change-Id: I387dd91464b211eb892dd4a3adc0b8dae6f84fa2
Reviewed-on: https://gerrit.libreoffice.org/54097
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
| -rw-r--r-- | vcl/inc/sallayout.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/CommonSalLayout.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/sallayout.cxx | 5 |
3 files changed, 2 insertions, 9 deletions
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index e94dcefeea50..b3f02e969fff 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -342,8 +342,6 @@ private: GenericSalLayout( const GenericSalLayout& ) = delete; GenericSalLayout& operator=( const GenericSalLayout& ) = delete; - void AppendGlyph( const GlyphItem& ); - void Reserve(int size) { m_GlyphItems.reserve(size + 1); } void ApplyDXArray(ImplLayoutArgs&); void Justify(DeviceCoordinate nNewWidth); void ApplyAsianKerning(const OUString& rStr); diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx index aac35c3b3f7b..546bd2f25ca2 100644 --- a/vcl/source/gdi/CommonSalLayout.cxx +++ b/vcl/source/gdi/CommonSalLayout.cxx @@ -274,7 +274,7 @@ bool GenericSalLayout::LayoutText(ImplLayoutArgs& rArgs) hb_face_t* pHbFace = hb_font_get_face(pHbFont); int nGlyphCapacity = 2 * (rArgs.mnEndCharPos - rArgs.mnMinCharPos); - Reserve(nGlyphCapacity); + m_GlyphItems.reserve(nGlyphCapacity); const int nLength = rArgs.mrStr.getLength(); const sal_Unicode *pStr = rArgs.mrStr.getStr(); @@ -571,7 +571,7 @@ bool GenericSalLayout::LayoutText(ImplLayoutArgs& rArgs) Point aNewPos(aCurrPos.X() + nXOffset, aCurrPos.Y() + nYOffset); const GlyphItem aGI(nCharPos, nCharCount, nGlyphIndex, aNewPos, nGlyphFlags, nAdvance, nXOffset); - AppendGlyph(aGI); + m_GlyphItems.push_back(aGI); aCurrPos.AdjustX(nAdvance ); } diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 2ec7ee80ed66..30a3240b628c 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -691,11 +691,6 @@ bool SalLayout::GetBoundRect( SalGraphics& rSalGraphics, tools::Rectangle& rRect return bRet; } -void GenericSalLayout::AppendGlyph( const GlyphItem& rGlyphItem ) -{ - m_GlyphItems.push_back(rGlyphItem); -} - DeviceCoordinate GenericSalLayout::FillDXArray( DeviceCoordinate* pCharWidths ) const { if( pCharWidths ) |