summaryrefslogtreecommitdiff
path: root/vcl/generic/glyphs
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-04-02 16:45:44 +0300
committerTor Lillqvist <tml@collabora.com>2014-04-02 16:54:18 +0300
commit50bf123ddbeb457b89636621a99c971834adf3ab (patch)
treeb7782261998ca0b6bece98543e2c66e3c96f4d3c /vcl/generic/glyphs
parentdb1c9e4dadc90c5afe3190776a60cc5dcbbce3ac (diff)
Kill superfluous vertical whitespace
Change-Id: I81ce8fd7022bf283db668705efdfb0666f87bde9
Diffstat (limited to 'vcl/generic/glyphs')
-rw-r--r--vcl/generic/glyphs/gcach_ftyp.cxx93
-rw-r--r--vcl/generic/glyphs/gcach_ftyp.hxx10
-rw-r--r--vcl/generic/glyphs/gcach_layout.cxx11
-rw-r--r--vcl/generic/glyphs/gcach_rbmp.cxx8
-rw-r--r--vcl/generic/glyphs/glyphcache.cxx21
-rw-r--r--vcl/generic/glyphs/graphite_serverfont.cxx3
-rw-r--r--vcl/generic/glyphs/scrptrun.h1
7 files changed, 0 insertions, 147 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 92da831181eb..ab5ddd8afa7b 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "gcach_ftyp.hxx"
#include "vcl/svapp.hxx"
@@ -89,8 +88,6 @@ static void InitGammaTable()
}
}
-
-
static FT_Library aLibFT = 0;
// enable linking with old FT versions
@@ -100,8 +97,6 @@ typedef ::boost::unordered_map<const char*, boost::shared_ptr<FtFontFile>, rtl::
namespace { struct vclFontFileList : public rtl::Static< FontFileList, vclFontFileList > {}; }
-
-
// TODO: remove when the priorities are selected by UI
// if (AH==0) => disable autohinting
// if (AA==0) => disable antialiasing
@@ -113,10 +108,8 @@ static int nDefaultPrioEmbedded = 2;
static int nDefaultPrioAutoHint = 1;
static int nDefaultPrioAntiAlias = 1;
-
// FreetypeManager
-
FtFontFile::FtFontFile( const OString& rNativeFileName )
: maNativeFileName( rNativeFileName ),
mpFileMap( NULL ),
@@ -143,8 +136,6 @@ FtFontFile::FtFontFile( const OString& rNativeFileName )
}
}
-
-
FtFontFile* FtFontFile::FindFontFile( const OString& rNativeFileName )
{
// font file already known? (e.g. for ttc, synthetic, aliased fonts)
@@ -161,8 +152,6 @@ FtFontFile* FtFontFile::FindFontFile( const OString& rNativeFileName )
return pFontFile;
}
-
-
bool FtFontFile::Map()
{
if( mnRefCount++ <= 0 )
@@ -190,8 +179,6 @@ bool FtFontFile::Map()
return (mpFileMap != NULL);
}
-
-
void FtFontFile::Unmap()
{
if( (--mnRefCount > 0) || (mpFileMap == NULL) )
@@ -228,8 +215,6 @@ const void * graphiteFontTable(const void* appFaceHandle, unsigned int name, siz
}
#endif
-
-
FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes,
const OString& rNativeFileName, int nFaceNum, sal_IntPtr nFontId, int nSynthetic)
:
@@ -254,8 +239,6 @@ FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes,
maDevFontAttributes.mnQuality += mpFontFile->GetLangBoost();
}
-
-
FtFontInfo::~FtFontInfo()
{
if( mpFontCharMap )
@@ -274,8 +257,6 @@ void FtFontInfo::InitHashes() const
mpGlyph2Char = new Int2IntMap();
}
-
-
FT_FaceRec_* FtFontInfo::GetFaceFT()
{
if (!maFaceFT && mpFontFile->Map())
@@ -314,8 +295,6 @@ GraphiteFaceWrapper * FtFontInfo::GetGraphiteFace()
}
#endif
-
-
void FtFontInfo::ReleaseFaceFT()
{
if (--mnRefCount <= 0)
@@ -326,8 +305,6 @@ void FtFontInfo::ReleaseFaceFT()
}
}
-
-
static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);}
static unsigned GetUShort( const unsigned char* p ){ return((p[0]<<8)+p[1]);}
//static signed GetSShort( const unsigned char* p ){ return((short)((p[0]<<8)+p[1]));}
@@ -372,16 +349,12 @@ const unsigned char* FtFontInfo::GetTable( const char* pTag, sal_uLong* pLength
return NULL;
}
-
-
void FtFontInfo::AnnounceFont( PhysicalFontCollection* pFontCollection )
{
ImplFTSFontData* pFD = new ImplFTSFontData( this, maDevFontAttributes );
pFontCollection->Add( pFD );
}
-
-
FreetypeManager::FreetypeManager()
: mnMaxFontId( 0 )
{
@@ -407,8 +380,6 @@ FreetypeManager::FreetypeManager()
vclFontFileList::get();
}
-
-
FT_Face ServerFont::GetFtFace() const
{
FT_Activate_Size( maSizeFT );
@@ -416,15 +387,11 @@ FT_Face ServerFont::GetFtFace() const
return maFaceFT;
}
-
-
FreetypeManager::~FreetypeManager()
{
ClearFontList();
}
-
-
void FreetypeManager::AddFontFile( const OString& rNormalizedName,
int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes& rDevFontAttr)
{
@@ -441,8 +408,6 @@ void FreetypeManager::AddFontFile( const OString& rNormalizedName,
mnMaxFontId = nFontId;
}
-
-
void FreetypeManager::AnnounceFonts( PhysicalFontCollection* pToAdd ) const
{
for( FontList::const_iterator it = maFontList.begin(); it != maFontList.end(); ++it )
@@ -452,8 +417,6 @@ void FreetypeManager::AnnounceFonts( PhysicalFontCollection* pToAdd ) const
}
}
-
-
void FreetypeManager::ClearFontList( )
{
for( FontList::iterator it = maFontList.begin(); it != maFontList.end(); ++it )
@@ -464,8 +427,6 @@ void FreetypeManager::ClearFontList( )
maFontList.clear();
}
-
-
ServerFont* FreetypeManager::CreateFont( const FontSelectPattern& rFSD )
{
FtFontInfo* pFontInfo = NULL;
@@ -484,8 +445,6 @@ ServerFont* FreetypeManager::CreateFont( const FontSelectPattern& rFSD )
return pNew;
}
-
-
ImplFTSFontData::ImplFTSFontData( FtFontInfo* pFI, const ImplDevFontAttributes& rDFA )
: PhysicalFontFace( rDFA, IFTSFONT_MAGIC ),
mpFtFontInfo( pFI )
@@ -494,18 +453,14 @@ ImplFTSFontData::ImplFTSFontData( FtFontInfo* pFI, const ImplDevFontAttributes&
mbOrientation = true;
}
-
-
ImplFontEntry* ImplFTSFontData::CreateFontInstance( FontSelectPattern& rFSD ) const
{
ImplServerFontEntry* pEntry = new ImplServerFontEntry( rFSD );
return pEntry;
}
-
// ServerFont
-
ServerFont::ServerFont( const FontSelectPattern& rFSD, FtFontInfo* pFI )
: maGlyphList( 0),
maFontSelData(rFSD),
@@ -668,8 +623,6 @@ bool ServerFont::TestFont() const
return mbFaceOk;
}
-
-
ServerFont::~ServerFont()
{
if( mpLayoutEngine )
@@ -683,15 +636,11 @@ ServerFont::~ServerFont()
ReleaseFromGarbageCollect();
}
-
-
int ServerFont::GetEmUnits() const
{
return maFaceFT->units_per_EM;
}
-
-
void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const
{
static_cast<ImplFontAttributes&>(rTo) = mpFontInfo->GetFontAttributes();
@@ -814,8 +763,6 @@ void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const
}
}
-
-
static inline void SplitGlyphFlags( const ServerFont& rFont, sal_GlyphId& rGlyphId, int& nGlyphFlags )
{
nGlyphFlags = rGlyphId & GF_FLAGMASK;
@@ -825,8 +772,6 @@ static inline void SplitGlyphFlags( const ServerFont& rFont, sal_GlyphId& rGlyph
rGlyphId = rFont.GetRawGlyphIndex( rGlyphId );
}
-
-
int ServerFont::ApplyGlyphTransform( int nGlyphFlags,
FT_Glyph pGlyphFT, bool bForBitmapProcessing ) const
{
@@ -900,8 +845,6 @@ int ServerFont::ApplyGlyphTransform( int nGlyphFlags,
return nAngle;
}
-
-
sal_GlyphId ServerFont::GetRawGlyphIndex(sal_UCS4 aChar, sal_UCS4 aVS) const
{
if( mpFontInfo->IsSymbolFont() )
@@ -945,8 +888,6 @@ sal_GlyphId ServerFont::GetRawGlyphIndex(sal_UCS4 aChar, sal_UCS4 aVS) const
return sal_GlyphId( nGlyphIndex);
}
-
-
sal_GlyphId ServerFont::FixupGlyphIndex( sal_GlyphId aGlyphId, sal_UCS4 aChar ) const
{
int nGlyphFlags = GF_NONE;
@@ -981,9 +922,6 @@ sal_GlyphId ServerFont::FixupGlyphIndex( sal_GlyphId aGlyphId, sal_UCS4 aChar )
return aGlyphId;
}
-
-
-
sal_GlyphId ServerFont::GetGlyphIndex( sal_UCS4 aChar ) const
{
sal_GlyphId aGlyphId = GetRawGlyphIndex( aChar );
@@ -991,8 +929,6 @@ sal_GlyphId ServerFont::GetGlyphIndex( sal_UCS4 aChar ) const
return aGlyphId;
}
-
-
static int lcl_GetCharWidth( FT_FaceRec_* pFaceFT, double fStretch, int nGlyphFlags )
{
int nCharWidth = pFaceFT->glyph->metrics.horiAdvance;
@@ -1006,8 +942,6 @@ static int lcl_GetCharWidth( FT_FaceRec_* pFaceFT, double fStretch, int nGlyphFl
return (nCharWidth + 32) >> 6;
}
-
-
void ServerFont::InitGlyphData( sal_GlyphId aGlyphId, GlyphData& rGD ) const
{
FT_Activate_Size( maSizeFT );
@@ -1058,8 +992,6 @@ void ServerFont::InitGlyphData( sal_GlyphId aGlyphId, GlyphData& rGD ) const
FT_Done_Glyph( pGlyphFT );
}
-
-
bool ServerFont::GetAntialiasAdvice( void ) const
{
if( GetFontSelData().mbNonAntialiased || (mnPrioAntiAlias<=0) )
@@ -1069,8 +1001,6 @@ bool ServerFont::GetAntialiasAdvice( void ) const
return bAdviseAA;
}
-
-
bool ServerFont::GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) const
{
FT_Activate_Size( maSizeFT );
@@ -1210,8 +1140,6 @@ bool ServerFont::GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap )
return true;
}
-
-
bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) const
{
FT_Activate_Size( maSizeFT );
@@ -1342,10 +1270,8 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap )
return true;
}
-
// determine unicode ranges in font
-
const ImplFontCharMap* ServerFont::GetImplFontCharMap( void ) const
{
const ImplFontCharMap* pIFCMap = mpFontInfo->GetImplFontCharMap();
@@ -1442,10 +1368,8 @@ bool ServerFont::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) c
return bRet;
}
-
// outline stuff
-
class PolyArgs
{
public:
@@ -1471,8 +1395,6 @@ private:
bool bHasOffline;
};
-
-
PolyArgs::PolyArgs( PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints )
: mrPolyPoly(rPolyPoly),
mnMaxPoints(nMaxPoints),
@@ -1485,17 +1407,12 @@ PolyArgs::PolyArgs( PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints )
maPosition.x = maPosition.y = 0;
}
-
-
-
PolyArgs::~PolyArgs()
{
delete[] mpFlagAry;
delete[] mpPointAry;
}
-
-
void PolyArgs::AddPoint( long nX, long nY, PolyFlags aFlag )
{
DBG_ASSERT( (mnPoints < mnMaxPoints), "FTGlyphOutline: AddPoint overflow!" );
@@ -1509,8 +1426,6 @@ void PolyArgs::AddPoint( long nX, long nY, PolyFlags aFlag )
bHasOffline |= (aFlag != POLY_NORMAL);
}
-
-
void PolyArgs::ClosePolygon()
{
if( !mnPoly++ )
@@ -1555,8 +1470,6 @@ void PolyArgs::ClosePolygon()
bHasOffline = false;
}
-
-
extern "C" {
// TODO: wait till all compilers accept that calling conventions
@@ -1608,8 +1521,6 @@ static int FT_cubic_to( FT_Vector_CPtr p1, FT_Vector_CPtr p2, FT_Vector_CPtr p3,
} // extern "C"
-
-
bool ServerFont::GetGlyphOutline( sal_GlyphId aGlyphId,
::basegfx::B2DPolyPolygon& rB2DPolyPoly ) const
{
@@ -1686,8 +1597,6 @@ bool ServerFont::GetGlyphOutline( sal_GlyphId aGlyphId,
return true;
}
-
-
bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
{
#define MKTAG(s) ((((((s[0]<<8)+s[1])<<8)+s[2])<<8)+s[3])
@@ -1943,6 +1852,4 @@ GraphiteFaceWrapper* ServerFont::GetGraphiteFace() const
}
#endif
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx
index 7015b343f960..7babff34e085 100644
--- a/vcl/generic/glyphs/gcach_ftyp.hxx
+++ b/vcl/generic/glyphs/gcach_ftyp.hxx
@@ -28,8 +28,6 @@
class GraphiteFaceWrapper;
#endif
-
-
// FtFontFile has the responsibility that a font file is only mapped once.
// (#86621#) the old directly ft-managed solution caused it to be mapped
// in up to nTTC*nSizes*nOrientation*nSynthetic times
@@ -56,8 +54,6 @@ private:
int mnLangBoost;
};
-
-
// FtFontInfo corresponds to an unscaled font face
class FtFontInfo
{
@@ -133,8 +129,6 @@ inline void FtFontInfo::CacheGlyphIndex( sal_UCS4 cChar, int nIndex ) const
(*mpGlyph2Char)[ nIndex ] = cChar;
}
-
-
class FreetypeManager
{
public:
@@ -155,8 +149,6 @@ private:
sal_IntPtr mnMaxFontId;
};
-
-
class ImplFTSFontData : public PhysicalFontFace
{
private:
@@ -175,8 +167,6 @@ public:
static bool CheckFontData( const PhysicalFontFace& r ) { return r.CheckMagic( IFTSFONT_MAGIC ); }
};
-
-
#endif // INCLUDED_VCL_GENERIC_GLYPHS_GCACH_FTYP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index dfbd653224a2..ff644e34c00f 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -38,10 +38,8 @@
#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
#include <comphelper/processfactory.hxx>
-
// layout implementation for ServerFont
-
ServerFontLayout::ServerFontLayout( ServerFont& rFont )
: mrServerFont( rFont )
{ }
@@ -51,14 +49,11 @@ void ServerFontLayout::DrawText( SalGraphics& rSalGraphics ) const
rSalGraphics.DrawServerFontLayout( *this );
}
-
-
bool ServerFontLayout::LayoutText( ImplLayoutArgs& rArgs )
{
return mrServerFont.GetLayoutEngine()->layout(*this, rArgs);
}
-
void ServerFontLayout::AdjustLayout( ImplLayoutArgs& rArgs )
{
GenericSalLayout::AdjustLayout( rArgs );
@@ -115,8 +110,6 @@ void ServerFontLayout::setNeedFallback(ImplLayoutArgs& rArgs, sal_Int32 nCharPos
rArgs.NeedFallback(nGraphemeStartPos, nGraphemeEndPos, bRightToLeft);
}
-
-
std::ostream &operator <<(std::ostream& s, ServerFont* pFont)
{
#ifndef SAL_LOG_INFO
@@ -553,8 +546,6 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
return true;
}
-
-
ServerFontLayoutEngine* ServerFont::GetLayoutEngine()
{
// find best layout engine for font, platform, script and language
@@ -564,6 +555,4 @@ ServerFontLayoutEngine* ServerFont::GetLayoutEngine()
return mpLayoutEngine;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/generic/glyphs/gcach_rbmp.cxx b/vcl/generic/glyphs/gcach_rbmp.cxx
index 0efe54cef3e0..23d3ed9abe75 100644
--- a/vcl/generic/glyphs/gcach_rbmp.cxx
+++ b/vcl/generic/glyphs/gcach_rbmp.cxx
@@ -17,20 +17,16 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "generic/glyphcache.hxx"
#include <string.h>
-
RawBitmap::RawBitmap()
: mnAllocated(0)
{}
-
RawBitmap::~RawBitmap()
{}
-
// used by 90 and 270 degree rotations on 8 bit deep bitmaps
static void ImplRotate8_90( unsigned char* p1, const unsigned char* p2,
int xmax, int ymax, int dx, int dy, int nPad )
@@ -44,7 +40,6 @@ static void ImplRotate8_90( unsigned char* p1, const unsigned char* p2,
}
}
-
// used by inplace 180 degree rotation on 8 bit deep bitmaps
static void ImplRotate8_180( unsigned char* p1, int xmax, int ymax, int nPad )
{
@@ -71,7 +66,6 @@ static void ImplRotate8_180( unsigned char* p1, int xmax, int ymax, int nPad )
}
}
-
// used by 90 or 270 degree rotations on 1 bit deep bitmaps
static void ImplRotate1_90( unsigned char* p1, const unsigned char* p2,
int xmax, int ymax, int dx, int nShift, int nDeltaShift, int nPad )
@@ -110,7 +104,6 @@ static void ImplRotate1_90( unsigned char* p1, const unsigned char* p2,
}
}
-
// used by 180 degrees rotations on 1 bit deep bitmaps
static void ImplRotate1_180( unsigned char* p1, const unsigned char* p2,
int xmax, int ymax, int nPad )
@@ -147,7 +140,6 @@ static void ImplRotate1_180( unsigned char* p1, const unsigned char* p2,
}
}
-
bool RawBitmap::Rotate( int nAngle )
{
sal_uLong nNewScanlineSize = 0;
diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx
index 7c7e2d15d8fc..2509c00bdb54 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
@@ -51,14 +50,12 @@ GlyphCache::GlyphCache( GlyphCachePeer& rPeer )
mpFtManager = new FreetypeManager;
}
-
GlyphCache::~GlyphCache()
{
InvalidateAllGlyphs();
delete mpFtManager;
}
-
void GlyphCache::InvalidateAllGlyphs()
{
for( FontList::iterator it = maFontList.begin(), end = maFontList.end(); it != end; ++it )
@@ -72,7 +69,6 @@ void GlyphCache::InvalidateAllGlyphs()
mpCurrentGCFont = NULL;
}
-
inline
size_t GlyphCache::IFSD_Hash::operator()( const FontSelectPattern& rFontSelData ) const
{
@@ -98,7 +94,6 @@ size_t GlyphCache::IFSD_Hash::operator()( const FontSelectPattern& rFontSelData
return nHash;
}
-
bool GlyphCache::IFSD_Equal::operator()( const FontSelectPattern& rA, const FontSelectPattern& rB) const
{
// check font ids
@@ -146,13 +141,11 @@ bool GlyphCache::IFSD_Equal::operator()( const FontSelectPattern& rA, const Font
return true;
}
-
GlyphCache& GlyphCache::GetInstance()
{
return *pInstance;
}
-
void GlyphCache::AddFontFile( const OString& rNormalizedName, int nFaceNum,
sal_IntPtr nFontId, const ImplDevFontAttributes& rDFA)
{
@@ -160,7 +153,6 @@ void GlyphCache::AddFontFile( const OString& rNormalizedName, int nFaceNum,
mpFtManager->AddFontFile( rNormalizedName, nFaceNum, nFontId, rDFA);
}
-
void GlyphCache::AnnounceFonts( PhysicalFontCollection* pFontCollection ) const
{
if( mpFtManager )
@@ -174,7 +166,6 @@ void GlyphCache::ClearFontCache()
mpFtManager->ClearFontList();
}
-
ServerFont* GlyphCache::CacheFont( const FontSelectPattern& rFontSelData )
{
// a serverfont request has pFontData
@@ -226,7 +217,6 @@ ServerFont* GlyphCache::CacheFont( const FontSelectPattern& rFontSelData )
return pNew;
}
-
void GlyphCache::UncacheFont( ServerFont& rServerFont )
{
// the interface for rServerFont must be const because a
@@ -241,7 +231,6 @@ void GlyphCache::UncacheFont( ServerFont& rServerFont )
}
}
-
void GlyphCache::GarbageCollect()
{
// when current GC font has been destroyed get another one
@@ -292,13 +281,11 @@ void GlyphCache::GarbageCollect()
}
}
-
inline void GlyphCache::UsingGlyph( ServerFont&, GlyphData& rGlyphData )
{
rGlyphData.SetLruValue( mnLruIndex++ );
}
-
inline void GlyphCache::AddedGlyph( ServerFont& rServerFont, GlyphData& rGlyphData )
{
++mnGlyphCount;
@@ -307,14 +294,12 @@ inline void GlyphCache::AddedGlyph( ServerFont& rServerFont, GlyphData& rGlyphDa
GrowNotify();
}
-
void GlyphCache::GrowNotify()
{
if( (mnBytesUsed + mrPeer.GetByteCount()) > mnMaxSize )
GarbageCollect();
}
-
inline void GlyphCache::RemovingGlyph( GlyphData& rGD )
{
mrPeer.RemovingGlyph( rGD );
@@ -322,7 +307,6 @@ inline void GlyphCache::RemovingGlyph( GlyphData& rGD )
--mnGlyphCount;
}
-
void ServerFont::ReleaseFromGarbageCollect()
{
// remove from GC list
@@ -334,14 +318,12 @@ void ServerFont::ReleaseFromGarbageCollect()
mpNextGCFont = NULL;
}
-
long ServerFont::Release() const
{
DBG_ASSERT( mnRefCount > 0, "ServerFont: RefCount underflow" );
return --mnRefCount;
}
-
GlyphData& ServerFont::GetGlyphData( sal_GlyphId aGlyphId )
{
// usually the GlyphData is cached
@@ -360,7 +342,6 @@ GlyphData& ServerFont::GetGlyphData( sal_GlyphId aGlyphId )
return rGlyphData;
}
-
void ServerFont::GarbageCollect( long nMinLruIndex )
{
GlyphList::iterator it = maGlyphList.begin();
@@ -379,14 +360,12 @@ void ServerFont::GarbageCollect( long nMinLruIndex )
}
}
-
ImplServerFontEntry::ImplServerFontEntry( FontSelectPattern& rFSD )
: ImplFontEntry( rFSD )
, mpServerFont( NULL )
, mbGotFontOptions( false )
{}
-
void ImplServerFontEntry::SetServerFont(ServerFont* p)
{
if (p == mpServerFont)
diff --git a/vcl/generic/glyphs/graphite_serverfont.cxx b/vcl/generic/glyphs/graphite_serverfont.cxx
index e2f50852d124..09159e4d985b 100644
--- a/vcl/generic/glyphs/graphite_serverfont.cxx
+++ b/vcl/generic/glyphs/graphite_serverfont.cxx
@@ -19,7 +19,6 @@
// Header files
-
// Platform
#include <i18nlangtag/languagetag.hxx>
#include <sallayout.hxx>
@@ -41,10 +40,8 @@ float freetypeServerFontAdvance(const void* appFontHandle, gr_uint16 glyphId)
return .0f;
}
-
// An implementation of the GraphiteLayout interface to enable Graphite enabled fonts to be used.
-
GraphiteServerFontLayout::GraphiteServerFontLayout(ServerFont& rServerFont) throw()
: ServerFontLayout(rServerFont),
maImpl(rServerFont.GetGraphiteFace()->face(), rServerFont)
diff --git a/vcl/generic/glyphs/scrptrun.h b/vcl/generic/glyphs/scrptrun.h
index 72975464a38e..38302e1413d8 100644
--- a/vcl/generic/glyphs/scrptrun.h
+++ b/vcl/generic/glyphs/scrptrun.h
@@ -176,5 +176,4 @@ inline void ScriptRun::reset(const UChar chars[], int32_t start, int32_t length)
reset(start, length);
}
-
#endif