diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-10 12:11:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-11 06:51:48 +0000 |
| commit | 6104a9807500c59196ff007d24cfe111f0b2754a (patch) | |
| tree | 1b91d7936d2895fcb30fe8cd47239ca3515837ed /vcl/source | |
| parent | 1da9b4c24e806ad2447b4a656e2a7192755bb6a8 (diff) | |
remove unused return type from SalGraphics::SetFont
Change-Id: I0ca41130f5e1028a70f1242f7af3366b7c57c572
Reviewed-on: https://gerrit.libreoffice.org/24833
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/font/fontinstance.cxx | 1 | ||||
| -rw-r--r-- | vcl/source/gdi/print.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/outdev/font.cxx | 8 |
3 files changed, 5 insertions, 6 deletions
diff --git a/vcl/source/font/fontinstance.cxx b/vcl/source/font/fontinstance.cxx index 908f51ba0b15..04d1061296da 100644 --- a/vcl/source/font/fontinstance.cxx +++ b/vcl/source/font/fontinstance.cxx @@ -44,7 +44,6 @@ LogicalFontInstance::LogicalFontInstance( const FontSelectPattern& rFontSelData , mpConversion( nullptr ) , mnLineHeight( 0 ) , mnRefCount( 1 ) - , mnSetFontFlags( 0 ) , mnOwnOrientation( 0 ) , mnOrientation( 0 ) , mbInit( false ) diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 8e07fd09770a..4c451817dc17 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -1782,7 +1782,7 @@ void Printer::InitFont() const if ( mbInitFont ) { // select font in the device layers - mpFontInstance->mnSetFontFlags = mpGraphics->SetFont( &(mpFontInstance->maFontSelData), 0 ); + mpGraphics->SetFont( &(mpFontInstance->maFontSelData), 0 ); mbInitFont = false; } } diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index 0d04de4039c1..c6c4f4f6bb34 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -1006,7 +1006,7 @@ void OutputDevice::InitFont() const mpFontInstance->maFontSelData.mbNonAntialiased = bNonAntialiased; // select font in the device layers - mpFontInstance->mnSetFontFlags = mpGraphics->SetFont( &(mpFontInstance->maFontSelData), 0 ); + mpGraphics->SetFont( &(mpFontInstance->maFontSelData), 0 ); mbInitFont = false; } } @@ -1323,7 +1323,7 @@ void OutputDevice::ImplDrawEmphasisMarks( SalLayout& rSalLayout ) mpMetaFile = pOldMetaFile; } -SalLayout* OutputDevice::getFallbackFont(LogicalFontInstance &rFallbackFont, +SalLayout* OutputDevice::getFallbackFont( FontSelectPattern &rFontSelData, int nFallbackLevel, ImplLayoutArgs& rLayoutArgs) const { @@ -1332,7 +1332,7 @@ SalLayout* OutputDevice::getFallbackFont(LogicalFontInstance &rFallbackFont, return nullptr; assert(mpGraphics != nullptr); - rFallbackFont.mnSetFontFlags = mpGraphics->SetFont( &rFontSelData, nFallbackLevel ); + mpGraphics->SetFont( &rFontSelData, nFallbackLevel ); rLayoutArgs.ResetPos(); SalLayout* pFallback = mpGraphics->GetTextLayout( rLayoutArgs, nFallbackLevel ); @@ -1410,7 +1410,7 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay } // create and add glyph fallback layout to multilayout - SalLayout* pFallback = getFallbackFont(*pFallbackFont, aFontSelData, + SalLayout* pFallback = getFallbackFont(aFontSelData, nFallbackLevel, rLayoutArgs); if (pFallback) { |