diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 22:51:59 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 04:56:16 -0600 |
commit | d9f0af83b7f0abe7119eefca62cbbca7eff818ef (patch) | |
tree | 19b6ed4d3b1dd538bb46205880505e59f8bb8002 /vcl/generic | |
parent | 0fb3bdc5d3aa47a61affc67b20bdbb775808fb66 (diff) |
Remove visual noise from vcl
Conflicts:
vcl/source/app/settings.cxx
vcl/source/window/dockmgr.cxx
vcl/source/window/dockwin.cxx
vcl/source/window/floatwin.cxx
vcl/source/window/toolbox2.cxx
Change-Id: Ie67681549a76e77064b09d4b5bf80fe4c6010341
Reviewed-on: https://gerrit.libreoffice.org/8339
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/fontconfig.cxx | 4 | ||||
-rw-r--r-- | vcl/generic/fontmanager/fontsubst.cxx | 6 | ||||
-rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 18 | ||||
-rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.hxx | 10 | ||||
-rw-r--r-- | vcl/generic/glyphs/gcach_layout.cxx | 10 | ||||
-rw-r--r-- | vcl/generic/glyphs/graphite_serverfont.cxx | 6 | ||||
-rw-r--r-- | vcl/generic/glyphs/scrptrun.cxx | 2 | ||||
-rw-r--r-- | vcl/generic/print/genpspgraphics.cxx | 6 |
9 files changed, 33 insertions, 33 deletions
diff --git a/vcl/generic/app/geninst.cxx b/vcl/generic/app/geninst.cxx index da3a3d66aad2..432fdf6c7e5b 100644 --- a/vcl/generic/app/geninst.cxx +++ b/vcl/generic/app/geninst.cxx @@ -27,9 +27,9 @@ #include "generic/geninst.h" -// + // SalYieldMutex -// + SalYieldMutex::SalYieldMutex() diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index 536dd769904c..2871f2f8bab6 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -168,7 +168,7 @@ namespace //See fdo#30729 for where an old opensymbol installed system-wide can //clobber the new opensymbol installed locally - // + //See if this font is a duplicate with equal attributes which has already been //inserted, or if it an older version of an inserted fonts. Depends on FcFontSet //on being sorted with SortFont @@ -568,7 +568,7 @@ void PrintFontManager::countFontconfigFonts( boost::unordered_map<OString, int, //remove font, reuse index //we want to remove unusable fonts here, in case there is a usable font //which duplicates the properties of the unusable one - // + //not removing the unusable font will risk the usable font being rejected //as a duplicate by isPreviouslyDuplicateOrObsoleted lcl_FcFontSetRemove(pFSet, i--); diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx index 4a9d5572735a..44cb5a7776ac 100644 --- a/vcl/generic/fontmanager/fontsubst.cxx +++ b/vcl/generic/fontmanager/fontsubst.cxx @@ -34,9 +34,9 @@ #include <unotools/fontdefs.hxx> #include <list> -// =========================================================================== + // platform specific font substitution hooks -// =========================================================================== + struct FontSelectPatternAttributesHash { @@ -262,7 +262,7 @@ bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFont return bHaveSubstitute; } -// =========================================================================== + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 53ccd83c055a..4c2443b51e54 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -112,9 +112,9 @@ static int nDefaultPrioEmbedded = 2; static int nDefaultPrioAutoHint = 1; static int nDefaultPrioAntiAlias = 1; -// ======================================================================= + // FreetypeManager -// ======================================================================= + FtFontFile::FtFontFile( const OString& rNativeFileName ) : maNativeFileName( rNativeFileName ), @@ -227,7 +227,7 @@ 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) @@ -379,7 +379,7 @@ void FtFontInfo::AnnounceFont( ImplDevFontList* pFontList ) pFontList->Add( pFD ); } -// ======================================================================= + FreetypeManager::FreetypeManager() : mnMaxFontId( 0 ) @@ -483,7 +483,7 @@ ServerFont* FreetypeManager::CreateFont( const FontSelectPattern& rFSD ) return pNew; } -// ======================================================================= + ImplFTSFontData::ImplFTSFontData( FtFontInfo* pFI, const ImplDevFontAttributes& rDFA ) : PhysicalFontFace( rDFA, IFTSFONT_MAGIC ), @@ -501,9 +501,9 @@ ImplFontEntry* ImplFTSFontData::CreateFontInstance( FontSelectPattern& rFSD ) co return pEntry; } -// ======================================================================= + // ServerFont -// ======================================================================= + ServerFont::ServerFont( const FontSelectPattern& rFSD, FtFontInfo* pFI ) : maGlyphList( 0), @@ -1729,7 +1729,7 @@ bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD ) { const sal_uLong nScriptTag = GetUInt( pScriptHeader+0 ); // e.g. hani/arab/kana/hang const sal_uInt16 nOfsScriptTable= GetUShort( pScriptHeader+4 ); - pScriptHeader += 6; //### + pScriptHeader += 6; if( (nScriptTag != nRequestedScript) && (nRequestedScript != 0) ) continue; @@ -1945,6 +1945,6 @@ 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 f4abb2fb886b..a4712cc64dbc 100644 --- a/vcl/generic/glyphs/gcach_ftyp.hxx +++ b/vcl/generic/glyphs/gcach_ftyp.hxx @@ -27,7 +27,7 @@ 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 @@ -55,7 +55,7 @@ private: int mnLangBoost; }; -// ----------------------------------------------------------------------- + // FtFontInfo corresponds to an unscaled font face class FtFontInfo @@ -132,7 +132,7 @@ inline void FtFontInfo::CacheGlyphIndex( sal_UCS4 cChar, int nIndex ) const (*mpGlyph2Char)[ nIndex ] = cChar; } -// ----------------------------------------------------------------------- + class FreetypeManager { @@ -154,7 +154,7 @@ private: sal_IntPtr mnMaxFontId; }; -// ----------------------------------------------------------------------- + class ImplFTSFontData : public PhysicalFontFace { @@ -174,7 +174,7 @@ public: static bool CheckFontData( const PhysicalFontFace& r ) { return r.CheckMagic( IFTSFONT_MAGIC ); } }; -// ----------------------------------------------------------------------- + #endif // INCLUDED_VCL_GENERIC_GLYPHS_GCACH_FTYP_HXX diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index 67eafe8a86c8..84f0a494e1d3 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -38,9 +38,9 @@ #include <com/sun/star/i18n/CharacterIteratorMode.hpp> #include <comphelper/processfactory.hxx> -// ======================================================================= + // layout implementation for ServerFont -// ======================================================================= + ServerFontLayout::ServerFontLayout( ServerFont& rFont ) : mrServerFont( rFont ) @@ -115,7 +115,7 @@ void ServerFontLayout::setNeedFallback(ImplLayoutArgs& rArgs, sal_Int32 nCharPos rArgs.NeedFallback(nGraphemeStartPos, nGraphemeEndPos, bRightToLeft); } -// ======================================================================= + std::ostream &operator <<(std::ostream& s, ServerFont* pFont) { @@ -553,7 +553,7 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs) return true; } -// ======================================================================= + ServerFontLayoutEngine* ServerFont::GetLayoutEngine() { @@ -564,6 +564,6 @@ ServerFontLayoutEngine* ServerFont::GetLayoutEngine() return mpLayoutEngine; } -// ======================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/generic/glyphs/graphite_serverfont.cxx b/vcl/generic/glyphs/graphite_serverfont.cxx index d548f5dd4852..e2f50852d124 100644 --- a/vcl/generic/glyphs/graphite_serverfont.cxx +++ b/vcl/generic/glyphs/graphite_serverfont.cxx @@ -18,7 +18,7 @@ */ // Header files -// + // Platform #include <i18nlangtag/languagetag.hxx> @@ -41,9 +41,9 @@ 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), diff --git a/vcl/generic/glyphs/scrptrun.cxx b/vcl/generic/glyphs/scrptrun.cxx index ea7790d900f1..9e8eef000917 100644 --- a/vcl/generic/glyphs/scrptrun.cxx +++ b/vcl/generic/glyphs/scrptrun.cxx @@ -166,7 +166,7 @@ UBool ScriptRun::next() int32_t pairIndex = getPairIndex(ch); // Paired character handling: - // + // if it's an open character, push it onto the stack. // if it's a close character, find the matching open on the // stack, and use that script code. Any non-matching open diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index 50927df0ef59..961d17f6e7b7 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -348,7 +348,7 @@ bool GenPspGraphics::setClipRegion( const Region& i_rClip ) m_pPrinterGfx->EndSetClipRegion(); //m_pPrinterGfx->BeginSetClipRegion( i_rClip.GetRectCount() ); - // + //ImplRegionInfo aInfo; //long nX, nY, nW, nH; //bool bRegionRect = i_rClip.ImplGetFirstRect(aInfo, nX, nY, nW, nH ); @@ -562,7 +562,7 @@ void GenPspGraphics::invert(long,long,long,long,SalInvert) OSL_FAIL("Warning: PrinterGfx::Invert() not implemented"); } -//========================================================================== + class ImplPspFontData : public PhysicalFontFace { @@ -593,7 +593,7 @@ ImplFontEntry* ImplPspFontData::CreateFontInstance( FontSelectPattern& rFSD ) co return pEntry; } -//========================================================================== + class PspFontLayout : public GenericSalLayout { |