diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /vcl/generic | |
parent | b81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff) |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/generic')
-rw-r--r-- | vcl/generic/app/geninst.cxx | 4 | ||||
-rw-r--r-- | vcl/generic/fontmanager/fontmanager.cxx | 76 | ||||
-rw-r--r-- | vcl/generic/fontmanager/fontsubst.cxx | 6 | ||||
-rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 82 | ||||
-rw-r--r-- | vcl/generic/glyphs/gcach_layout.cxx | 4 | ||||
-rw-r--r-- | vcl/generic/print/genprnpsp.cxx | 2 | ||||
-rw-r--r-- | vcl/generic/print/genpspgraphics.cxx | 24 |
7 files changed, 99 insertions, 99 deletions
diff --git a/vcl/generic/app/geninst.cxx b/vcl/generic/app/geninst.cxx index c2a6c79cac4f..da3a3d66aad2 100644 --- a/vcl/generic/app/geninst.cxx +++ b/vcl/generic/app/geninst.cxx @@ -26,11 +26,11 @@ #include "generic/geninst.h" -// ------------------------------------------------------------------------- + // // SalYieldMutex // -// ------------------------------------------------------------------------- + SalYieldMutex::SalYieldMutex() { diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index 4102df704506..ae82903b9a71 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -108,7 +108,7 @@ inline sal_uInt32 getUInt32BE( const sal_uInt8*& pBuffer ) return nRet; } -// ------------------------------------------------------------------------- + static FontWeight parseWeight( const OString& rWeight ) { @@ -173,20 +173,20 @@ PrintFontManager::PrintFont::PrintFont( fonttype::type eType ) : { } -// ------------------------------------------------------------------------- + PrintFontManager::PrintFont::~PrintFont() { delete m_pMetrics; } -// ------------------------------------------------------------------------- + PrintFontManager::Type1FontFile::~Type1FontFile() { } -// ------------------------------------------------------------------------- + PrintFontManager::TrueTypeFontFile::TrueTypeFontFile() : PrintFont( fonttype::TrueType ) @@ -195,20 +195,20 @@ PrintFontManager::TrueTypeFontFile::TrueTypeFontFile() , m_nTypeFlags( TYPEFLAG_INVALID ) {} -// ------------------------------------------------------------------------- + PrintFontManager::TrueTypeFontFile::~TrueTypeFontFile() { } -// ------------------------------------------------------------------------- + bool PrintFontManager::Type1FontFile::queryMetricPage( int /*nPage*/, MultiAtomProvider* pProvider ) { return readAfmMetrics( pProvider, false, false ); } -// ------------------------------------------------------------------------- + bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomProvider* /*pProvider*/ ) { @@ -275,7 +275,7 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr return bSuccess; } -// ------------------------------------------------------------------------- + /* #i73387# There seem to be fonts with a rather unwell chosen family name * consider e.g. "Helvetica Narrow" which defines its family as "Helvetica" @@ -664,7 +664,7 @@ PrintFontManager& PrintFontManager::get() return *pManager; } -// ------------------------------------------------------------------------- + /* * the PrintFontManager @@ -691,7 +691,7 @@ PrintFontManager::PrintFontManager() m_aFontInstallerTimer.SetTimeout(5000); } -// ------------------------------------------------------------------------- + PrintFontManager::~PrintFontManager() { @@ -703,7 +703,7 @@ PrintFontManager::~PrintFontManager() delete m_pFontCache; } -// ------------------------------------------------------------------------- + OString PrintFontManager::getDirectory( int nAtom ) const { @@ -711,7 +711,7 @@ OString PrintFontManager::getDirectory( int nAtom ) const return it != m_aAtomToDir.end() ? it->second : OString(); } -// ------------------------------------------------------------------------- + int PrintFontManager::getDirectoryAtom( const OString& rDirectory, bool bCreate ) { @@ -729,7 +729,7 @@ int PrintFontManager::getDirectoryAtom( const OString& rDirectory, bool bCreate return nAtom; } -// ------------------------------------------------------------------------- + std::vector<fontID> PrintFontManager::addFontFile( const OString& rFileName ) { @@ -919,7 +919,7 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, :: return ! rNewFonts.empty(); } -// ------------------------------------------------------------------------- + fontID PrintFontManager::findFontFileID( int nDirID, const OString& rFontFile, int nFaceIndex ) const { @@ -999,7 +999,7 @@ std::vector<fontID> PrintFontManager::findFontFileIDs( int nDirID, const OString return aIds; } -// ------------------------------------------------------------------------- + OUString PrintFontManager::convertTrueTypeName( void* pRecord ) const { @@ -1085,7 +1085,7 @@ namespace } } -// ------------------------------------------------------------------------- + void PrintFontManager::analyzeTrueTypeFamilyName( void* pTTFont, ::std::list< OUString >& rNames ) const { @@ -1140,7 +1140,7 @@ void PrintFontManager::analyzeTrueTypeFamilyName( void* pTTFont, ::std::list< OU return; } -// ------------------------------------------------------------------------- + bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const { @@ -1467,7 +1467,7 @@ void PrintFontManager::initialize() #endif } -// ------------------------------------------------------------------------- + void PrintFontManager::getFontList( ::std::list< fontID >& rFontIDs ) { @@ -1478,7 +1478,7 @@ void PrintFontManager::getFontList( ::std::list< fontID >& rFontIDs ) rFontIDs.push_back( it->first ); } -// ------------------------------------------------------------------------- + void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& rInfo ) const { @@ -1502,7 +1502,7 @@ void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& r rInfo.m_aAliases.push_back( m_pAtoms->getString( ATOM_FAMILYNAME, *it ) ); } -// ------------------------------------------------------------------------- + void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo ) const { @@ -1525,7 +1525,7 @@ void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo rInfo.m_nWidth = pFont->m_aGlobalMetricX.width < pFont->m_aGlobalMetricY.width ? pFont->m_aGlobalMetricY.width : pFont->m_aGlobalMetricX.width; } -// ------------------------------------------------------------------------- + bool PrintFontManager::getFontInfo( fontID nFontID, PrintFontInfo& rInfo ) const { @@ -1538,7 +1538,7 @@ bool PrintFontManager::getFontInfo( fontID nFontID, PrintFontInfo& rInfo ) const return pFont ? true : false; } -// ------------------------------------------------------------------------- + bool PrintFontManager::getFontFastInfo( fontID nFontID, FastPrintFontInfo& rInfo ) const { @@ -1551,7 +1551,7 @@ bool PrintFontManager::getFontFastInfo( fontID nFontID, FastPrintFontInfo& rInfo return pFont ? true : false; } -// ------------------------------------------------------------------------- + bool PrintFontManager::getFontBoundingBox( fontID nFontID, int& xMin, int& yMin, int& xMax, int& yMax ) { @@ -1576,7 +1576,7 @@ bool PrintFontManager::getFontBoundingBox( fontID nFontID, int& xMin, int& yMin, return bSuccess; } -// ------------------------------------------------------------------------- + int PrintFontManager::getFontFaceNumber( fontID nFontID ) const { @@ -1589,7 +1589,7 @@ int PrintFontManager::getFontFaceNumber( fontID nFontID ) const return nRet; } -// ------------------------------------------------------------------------- + FontFamily PrintFontManager::matchFamilyName( const OUString& rFamily ) const @@ -1657,7 +1657,7 @@ FontFamily PrintFontManager::matchFamilyName( const OUString& rFamily ) const return FAMILY_DONTKNOW; } -// ------------------------------------------------------------------------- + OString PrintFontManager::getAfmFile( PrintFont* pFont ) const { @@ -1680,7 +1680,7 @@ OString PrintFontManager::getAfmFile( PrintFont* pFont ) const return aMetricPath; } -// ------------------------------------------------------------------------- + OString PrintFontManager::getFontFile( PrintFont* pFont ) const { @@ -1705,7 +1705,7 @@ OString PrintFontManager::getFontFile( PrintFont* pFont ) const return aPath; } -// ------------------------------------------------------------------------- + const OUString& PrintFontManager::getPSName( fontID nFontID ) const { @@ -1719,7 +1719,7 @@ const OUString& PrintFontManager::getPSName( fontID nFontID ) const return m_pAtoms->getString( ATOM_PSNAME, pFont ? pFont->m_nPSName : INVALID_ATOM ); } -// ------------------------------------------------------------------------- + int PrintFontManager::getFontAscend( fontID nFontID ) const { @@ -1735,7 +1735,7 @@ int PrintFontManager::getFontAscend( fontID nFontID ) const return pFont->m_nAscend; } -// ------------------------------------------------------------------------- + int PrintFontManager::getFontDescend( fontID nFontID ) const { @@ -1751,7 +1751,7 @@ int PrintFontManager::getFontDescend( fontID nFontID ) const return pFont->m_nDescend; } -// ------------------------------------------------------------------------- + void PrintFontManager::hasVerticalSubstitutions( fontID nFontID, const sal_Unicode* pCharacters, int nCharacters, bool* pHasSubst ) const @@ -1780,7 +1780,7 @@ void PrintFontManager::hasVerticalSubstitutions( fontID nFontID, } } -// ------------------------------------------------------------------------- + bool PrintFontManager::isFontDownloadingAllowedForPrinting( fontID nFont ) const { @@ -1818,7 +1818,7 @@ bool PrintFontManager::isFontDownloadingAllowedForPrinting( fontID nFont ) const return bRet; } -// ------------------------------------------------------------------------- + bool PrintFontManager::getMetrics( fontID nFontID, const sal_Unicode* pString, int nLen, CharacterMetric* pArray, bool bVertical ) const { @@ -1861,7 +1861,7 @@ bool PrintFontManager::getMetrics( fontID nFontID, const sal_Unicode* pString, i return true; } -// ------------------------------------------------------------------------- + bool PrintFontManager::getMetrics( fontID nFontID, sal_Unicode minCharacter, sal_Unicode maxCharacter, CharacterMetric* pArray, bool bVertical ) const { @@ -1910,7 +1910,7 @@ bool PrintFontManager::getMetrics( fontID nFontID, sal_Unicode minCharacter, sal return true; } -// ------------------------------------------------------------------------- + // TODO: move most of this stuff into the central font-subsetting code bool PrintFontManager::createFontSubset( @@ -2143,7 +2143,7 @@ void PrintFontManager::getGlyphWidths( fontID nFont, } } -// ------------------------------------------------------------------------- + const std::map< sal_Unicode, sal_Int32 >* PrintFontManager::getEncodingMap( fontID nFont, const std::map< sal_Unicode, OString >** pNonEncoded ) const { @@ -2160,7 +2160,7 @@ const std::map< sal_Unicode, sal_Int32 >* PrintFontManager::getEncodingMap( font return pFont->m_aEncodingVector.size() ? &pFont->m_aEncodingVector : NULL; } -// ------------------------------------------------------------------------- + std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aChar ) const { @@ -2182,7 +2182,7 @@ std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aCha return aRet; } -// ------------------------------------------------------------------------- + std::list< sal_Unicode > PrintFontManager::getUnicodeFromAdobeName( const OString& rName ) const { std::pair< boost::unordered_multimap< OString, sal_Unicode, OStringHash >::const_iterator, diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx index 7b2394cfcc6a..4a9d5572735a 100644 --- a/vcl/generic/fontmanager/fontsubst.cxx +++ b/vcl/generic/fontmanager/fontsubst.cxx @@ -114,7 +114,7 @@ void SalGenericInstance::RegisterFontSubstitutors( ImplDevFontList* pList ) } } -// ----------------------------------------------------------------------- + static FontSelectPattern GetFcSubstitute(const FontSelectPattern &rFontSelData, OUString& rMissingCodes ) { @@ -152,7 +152,7 @@ namespace }; } -//-------------------------------------------------------------------------- + bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelData ) const { @@ -219,7 +219,7 @@ bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelDa return bHaveSubstitute; } -// ----------------------------------------------------------------------- + bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFontSelData, OUString& rMissingCodes ) const diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 42be83680f3b..53ccd83c055a 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -88,7 +88,7 @@ static void InitGammaTable() } } -// ----------------------------------------------------------------------- + static FT_Library aLibFT = 0; @@ -99,7 +99,7 @@ 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 @@ -142,7 +142,7 @@ FtFontFile::FtFontFile( const OString& rNativeFileName ) } } -// ----------------------------------------------------------------------- + FtFontFile* FtFontFile::FindFontFile( const OString& rNativeFileName ) { @@ -160,7 +160,7 @@ FtFontFile* FtFontFile::FindFontFile( const OString& rNativeFileName ) return pFontFile; } -// ----------------------------------------------------------------------- + bool FtFontFile::Map() { @@ -189,7 +189,7 @@ bool FtFontFile::Map() return (mpFileMap != NULL); } -// ----------------------------------------------------------------------- + void FtFontFile::Unmap() { @@ -253,7 +253,7 @@ FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes, maDevFontAttributes.mnQuality += mpFontFile->GetLangBoost(); } -// ----------------------------------------------------------------------- + FtFontInfo::~FtFontInfo() { @@ -273,7 +273,7 @@ void FtFontInfo::InitHashes() const mpGlyph2Char = new Int2IntMap(); } -// ----------------------------------------------------------------------- + FT_FaceRec_* FtFontInfo::GetFaceFT() { @@ -313,7 +313,7 @@ GraphiteFaceWrapper * FtFontInfo::GetGraphiteFace() } #endif -// ----------------------------------------------------------------------- + void FtFontInfo::ReleaseFaceFT() { @@ -325,7 +325,7 @@ 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]);} @@ -371,7 +371,7 @@ const unsigned char* FtFontInfo::GetTable( const char* pTag, sal_uLong* pLength return NULL; } -// ----------------------------------------------------------------------- + void FtFontInfo::AnnounceFont( ImplDevFontList* pFontList ) { @@ -406,7 +406,7 @@ FreetypeManager::FreetypeManager() vclFontFileList::get(); } -// ----------------------------------------------------------------------- + FT_Face ServerFont::GetFtFace() const { @@ -415,14 +415,14 @@ FT_Face ServerFont::GetFtFace() const return maFaceFT; } -// ----------------------------------------------------------------------- + FreetypeManager::~FreetypeManager() { ClearFontList(); } -// ----------------------------------------------------------------------- + void FreetypeManager::AddFontFile( const OString& rNormalizedName, int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes& rDevFontAttr) @@ -440,7 +440,7 @@ void FreetypeManager::AddFontFile( const OString& rNormalizedName, mnMaxFontId = nFontId; } -// ----------------------------------------------------------------------- + void FreetypeManager::AnnounceFonts( ImplDevFontList* pToAdd ) const { @@ -451,7 +451,7 @@ void FreetypeManager::AnnounceFonts( ImplDevFontList* pToAdd ) const } } -// ----------------------------------------------------------------------- + void FreetypeManager::ClearFontList( ) { @@ -463,7 +463,7 @@ void FreetypeManager::ClearFontList( ) maFontList.clear(); } -// ----------------------------------------------------------------------- + ServerFont* FreetypeManager::CreateFont( const FontSelectPattern& rFSD ) { @@ -493,7 +493,7 @@ ImplFTSFontData::ImplFTSFontData( FtFontInfo* pFI, const ImplDevFontAttributes& mbOrientation = true; } -// ----------------------------------------------------------------------- + ImplFontEntry* ImplFTSFontData::CreateFontInstance( FontSelectPattern& rFSD ) const { @@ -667,7 +667,7 @@ bool ServerFont::TestFont() const return mbFaceOk; } -// ----------------------------------------------------------------------- + ServerFont::~ServerFont() { @@ -682,14 +682,14 @@ ServerFont::~ServerFont() ReleaseFromGarbageCollect(); } - // ----------------------------------------------------------------------- + int ServerFont::GetEmUnits() const { return maFaceFT->units_per_EM; } -// ----------------------------------------------------------------------- + void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const { @@ -813,7 +813,7 @@ void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const } } -// ----------------------------------------------------------------------- + static inline void SplitGlyphFlags( const ServerFont& rFont, sal_GlyphId& rGlyphId, int& nGlyphFlags ) { @@ -824,7 +824,7 @@ 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 @@ -899,7 +899,7 @@ int ServerFont::ApplyGlyphTransform( int nGlyphFlags, return nAngle; } -// ----------------------------------------------------------------------- + sal_GlyphId ServerFont::GetRawGlyphIndex(sal_UCS4 aChar, sal_UCS4 aVS) const { @@ -944,7 +944,7 @@ 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 { @@ -981,7 +981,7 @@ sal_GlyphId ServerFont::FixupGlyphIndex( sal_GlyphId aGlyphId, sal_UCS4 aChar ) } -// ----------------------------------------------------------------------- + sal_GlyphId ServerFont::GetGlyphIndex( sal_UCS4 aChar ) const { @@ -990,7 +990,7 @@ sal_GlyphId ServerFont::GetGlyphIndex( sal_UCS4 aChar ) const return aGlyphId; } -// ----------------------------------------------------------------------- + static int lcl_GetCharWidth( FT_FaceRec_* pFaceFT, double fStretch, int nGlyphFlags ) { @@ -1005,7 +1005,7 @@ static int lcl_GetCharWidth( FT_FaceRec_* pFaceFT, double fStretch, int nGlyphFl return (nCharWidth + 32) >> 6; } -// ----------------------------------------------------------------------- + void ServerFont::InitGlyphData( sal_GlyphId aGlyphId, GlyphData& rGD ) const { @@ -1058,7 +1058,7 @@ void ServerFont::InitGlyphData( sal_GlyphId aGlyphId, GlyphData& rGD ) const FT_Done_Glyph( pGlyphFT ); } -// ----------------------------------------------------------------------- + bool ServerFont::GetAntialiasAdvice( void ) const { @@ -1069,7 +1069,7 @@ bool ServerFont::GetAntialiasAdvice( void ) const return bAdviseAA; } -// ----------------------------------------------------------------------- + bool ServerFont::GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) const { @@ -1211,7 +1211,7 @@ bool ServerFont::GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) return true; } -// ----------------------------------------------------------------------- + bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) const { @@ -1344,9 +1344,9 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) return true; } -// ----------------------------------------------------------------------- + // determine unicode ranges in font -// ----------------------------------------------------------------------- + const ImplFontCharMap* ServerFont::GetImplFontCharMap( void ) const { @@ -1444,9 +1444,9 @@ bool ServerFont::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) c return bRet; } -// ----------------------------------------------------------------------- + // outline stuff -// ----------------------------------------------------------------------- + class PolyArgs { @@ -1473,7 +1473,7 @@ private: bool bHasOffline; }; -// ----------------------------------------------------------------------- + PolyArgs::PolyArgs( PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints ) : mrPolyPoly(rPolyPoly), @@ -1487,7 +1487,7 @@ PolyArgs::PolyArgs( PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints ) maPosition.x = maPosition.y = 0; } -// ----------------------------------------------------------------------- + PolyArgs::~PolyArgs() @@ -1496,7 +1496,7 @@ PolyArgs::~PolyArgs() delete[] mpPointAry; } -// ----------------------------------------------------------------------- + void PolyArgs::AddPoint( long nX, long nY, PolyFlags aFlag ) { @@ -1511,7 +1511,7 @@ void PolyArgs::AddPoint( long nX, long nY, PolyFlags aFlag ) bHasOffline |= (aFlag != POLY_NORMAL); } -// ----------------------------------------------------------------------- + void PolyArgs::ClosePolygon() { @@ -1557,7 +1557,7 @@ void PolyArgs::ClosePolygon() bHasOffline = false; } -// ----------------------------------------------------------------------- + extern "C" { @@ -1610,7 +1610,7 @@ 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 @@ -1688,7 +1688,7 @@ bool ServerFont::GetGlyphOutline( sal_GlyphId aGlyphId, return true; } -// ----------------------------------------------------------------------- + bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD ) { diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index dcf21965801c..67eafe8a86c8 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -51,14 +51,14 @@ 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 ); diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 501260b22608..3fb28d2f17e2 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -1317,7 +1317,7 @@ void PrinterUpdate::doUpdate() pInst->PostPrintersChanged(); } -// ----------------------------------------------------------------------- + IMPL_STATIC_LINK_NOINSTANCE( PrinterUpdate, UpdateTimerHdl, void*, EMPTYARG ) { diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index f4e4dc3d5701..50927df0ef59 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -578,14 +578,14 @@ public: static bool CheckFontData( const PhysicalFontFace& r ) { return r.CheckMagic( PSPFD_MAGIC ); } }; -//-------------------------------------------------------------------------- + ImplPspFontData::ImplPspFontData( const psp::FastPrintFontInfo& rInfo ) : PhysicalFontFace( GenPspGraphics::Info2DevFontAttributes(rInfo), PSPFD_MAGIC ), mnFontId( rInfo.m_nID ) {} -//-------------------------------------------------------------------------- + ImplFontEntry* ImplPspFontData::CreateFontInstance( FontSelectPattern& rFSD ) const { @@ -612,7 +612,7 @@ private: bool mbArtBold; }; -//-------------------------------------------------------------------------- + PspFontLayout::PspFontLayout( ::psp::PrinterGfx& rGfx ) : mrPrinterGfx( rGfx ) @@ -625,7 +625,7 @@ PspFontLayout::PspFontLayout( ::psp::PrinterGfx& rGfx ) mbArtBold = mrPrinterGfx.GetArtificialBold(); } -//-------------------------------------------------------------------------- + bool PspFontLayout::LayoutText( ImplLayoutArgs& rArgs ) { @@ -725,7 +725,7 @@ void PspServerFontLayout::InitFont() const mnOrientation, mbVertical, mbArtItalic, mbArtBold ); } -//-------------------------------------------------------------------------- + static void DrawPrinterLayout( const SalLayout& rLayout, ::psp::PrinterGfx& rGfx, bool bIsPspServerFontLayout ) { @@ -782,7 +782,7 @@ static void DrawPrinterLayout( const SalLayout& rLayout, ::psp::PrinterGfx& rGfx } } -//-------------------------------------------------------------------------- + void PspFontLayout::InitFont() const { @@ -790,7 +790,7 @@ void PspFontLayout::InitFont() const mnOrientation, mbVertical, mbArtItalic, mbArtBold ); } -//-------------------------------------------------------------------------- + void PspFontLayout::DrawText( SalGraphics& ) const { @@ -1006,7 +1006,7 @@ SalLayout* GenPspGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe return pLayout; } -//-------------------------------------------------------------------------- + bool GenPspGraphics::CreateFontSubset( const OUString& rToFile, @@ -1036,7 +1036,7 @@ bool GenPspGraphics::CreateFontSubset( return bSuccess; } -//-------------------------------------------------------------------------- + const Ucs2SIntMap* GenPspGraphics::GetFontEncodingVector( const PhysicalFontFace* pFont, const Ucs2OStrMap** pNonEncoded ) { @@ -1049,7 +1049,7 @@ const Ucs2SIntMap* GenPspGraphics::GetFontEncodingVector( const PhysicalFontFace return GenPspGraphics::DoGetFontEncodingVector( aFont, pNonEncoded ); } -//-------------------------------------------------------------------------- + void GenPspGraphics::GetGlyphWidths( const PhysicalFontFace* pFont, bool bVertical, @@ -1088,7 +1088,7 @@ void GenPspGraphics::DoGetGlyphWidths( psp::fontID aFont, psp::PrintFontManager& rMgr = psp::PrintFontManager::get(); rMgr.getGlyphWidths( aFont, bVertical, rWidths, rUnicodeEnc ); } -// ---------------------------------------------------------------------------- + ImplDevFontAttributes GenPspGraphics::Info2DevFontAttributes( const psp::FastPrintFontInfo& rInfo ) { @@ -1165,7 +1165,7 @@ namespace vcl } } -// ----------------------------------------------------------------------- + void GenPspGraphics::AnnounceFonts( ImplDevFontList* pFontList, const psp::FastPrintFontInfo& aInfo ) { |