From 062e40c76bcab664907737feace74f134a25c29c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 2 Mar 2015 10:43:28 +0200 Subject: loplugin:constantfunction: vcl Change-Id: I985b781a8d53190505fcb1182749cdaf5cd0f8d0 --- vcl/win/source/gdi/winlayout.cxx | 8 -------- vcl/win/source/gdi/winlayout.hxx | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'vcl/win') diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index a46d2cd155ec..7114db26f577 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -341,14 +341,6 @@ bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs ) mpGlyphRTLFlags[ mnGlyphCount ] = true; } - // for vertical writing use vertical alternatives - if( bVertical ) - { - sal_UCS4 cVert = ::GetVerticalChar( cChar ); - if( cVert ) - cChar = cVert; - } - // rewrite the original string // update the mappings between original and rewritten string // TODO: support surrogates in rewritten strings diff --git a/vcl/win/source/gdi/winlayout.hxx b/vcl/win/source/gdi/winlayout.hxx index 7847665cfa79..188b9539cbd7 100644 --- a/vcl/win/source/gdi/winlayout.hxx +++ b/vcl/win/source/gdi/winlayout.hxx @@ -124,13 +124,13 @@ public: virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const; virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra, int nFactor) const SAL_OVERRIDE; virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const; - virtual bool IsKashidaPosValid ( int nCharPos ) const; + virtual bool IsKashidaPosValid ( int nCharPos ) const SAL_OVERRIDE; // for glyph+font+script fallback virtual void MoveGlyph( int nStart, long nNewXPos ); virtual void DropGlyph( int nStart ); virtual void Simplify( bool bIsBase ); - virtual void DisableGlyphInjection( bool bDisable ) { mbDisableGlyphInjection = bDisable; } + virtual void DisableGlyphInjection( bool bDisable ) SAL_OVERRIDE { mbDisableGlyphInjection = bDisable; } protected: virtual ~UniscribeLayout(); -- cgit