summaryrefslogtreecommitdiff
path: root/vcl/win/source/gdi
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-25 22:51:59 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-26 04:56:16 -0600
commitd9f0af83b7f0abe7119eefca62cbbca7eff818ef (patch)
tree19b6ed4d3b1dd538bb46205880505e59f8bb8002 /vcl/win/source/gdi
parent0fb3bdc5d3aa47a61affc67b20bdbb775808fb66 (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/win/source/gdi')
-rw-r--r--vcl/win/source/gdi/salgdi.cxx36
-rw-r--r--vcl/win/source/gdi/salgdi2.cxx2
-rw-r--r--vcl/win/source/gdi/salgdi3.cxx18
-rw-r--r--vcl/win/source/gdi/salnativewidgets-luna.cxx6
-rw-r--r--vcl/win/source/gdi/salprn.cxx2
-rw-r--r--vcl/win/source/gdi/salvd.cxx6
-rw-r--r--vcl/win/source/gdi/winlayout.cxx24
7 files changed, 47 insertions, 47 deletions
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 845fb22a43af..04faaa67151d 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -33,12 +33,12 @@
#include <win/salframe.h>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
-// =======================================================================
+
// comment out to prevent use of beziers on GDI functions
#define USE_GDI_BEZIERS
-// =======================================================================
+
#define DITHER_PAL_DELTA 51
#define DITHER_PAL_STEPS 6
@@ -47,7 +47,7 @@
#define DITHER_EXTRA_COLORS 1
#define DMAP( _def_nVal, _def_nThres ) ((pDitherDiff[_def_nVal]>(_def_nThres))?pDitherHigh[_def_nVal]:pDitherLow[_def_nVal])
-// =======================================================================
+
struct SysColorEntry
{
@@ -55,7 +55,7 @@ struct SysColorEntry
SysColorEntry* pNext;
};
-// =======================================================================
+
static SysColorEntry* pFirstSysColor = NULL;
static SysColorEntry* pActSysColor = NULL;
@@ -118,19 +118,19 @@ static BYTE aOrdDither16Bit[8][8] =
{ 5, 3, 4, 2, 5, 3, 4, 2 }
};
-// =======================================================================
+
// we must create pens with 1-pixel width; otherwise the S3-graphics card
// map has many paint problems when drawing polygons/polyLines and a
// complex is set
#define GSL_PEN_WIDTH 1
-// =======================================================================
+
#define SAL_POLYPOLYCOUNT_STACKBUF 8
#define SAL_POLYPOLYPOINTS_STACKBUF 64
-// =======================================================================
+
void ImplInitSalGDI()
{
@@ -411,7 +411,7 @@ static int ImplIsPaletteEntry( BYTE nRed, BYTE nGreen, BYTE nBlue )
return FALSE;
}
-// =======================================================================
+
int ImplIsSysColorEntry( SalColor nSalColor )
{
@@ -430,7 +430,7 @@ int ImplIsSysColorEntry( SalColor nSalColor )
return FALSE;
}
-// =======================================================================
+
static void ImplInsertSysColorEntry( int nSysIndex )
{
@@ -453,7 +453,7 @@ static void ImplInsertSysColorEntry( int nSysIndex )
}
}
-// =======================================================================
+
void ImplUpdateSysColorEntries()
{
@@ -504,7 +504,7 @@ static SalColor ImplGetROPSalColor( SalROPColor nROPColor )
return nSalColor;
}
-// =======================================================================
+
void ImplSalInitGraphics( WinSalGraphics* pData )
{
@@ -538,7 +538,7 @@ void ImplSalDeInitGraphics( WinSalGraphics* pData )
SelectFont( pData->getHDC(), pData->mhDefFont );
}
-// =======================================================================
+
HDC ImplGetCachedDC( sal_uLong nID, HBITMAP hBmp )
{
@@ -572,7 +572,7 @@ HDC ImplGetCachedDC( sal_uLong nID, HBITMAP hBmp )
return pC->mhDC;
}
-// =======================================================================
+
void ImplReleaseCachedDC( sal_uLong nID )
{
@@ -583,7 +583,7 @@ void ImplReleaseCachedDC( sal_uLong nID )
SelectObject( pC->mhDC, pC->mhSelBmp );
}
-// =======================================================================
+
void ImplClearHDCCache( SalData* pData )
{
@@ -604,7 +604,7 @@ void ImplClearHDCCache( SalData* pData )
}
}
-// =======================================================================
+
// #100127# Fill point and flag memory from array of points which
// might also contain bezier control points for the PolyDraw() GDI method
@@ -677,7 +677,7 @@ void ImplPreparePolyDraw( bool bCloseFigures,
}
}
-// =======================================================================
+
// #100127# draw an array of points which might also contain bezier control points
void ImplRenderPath( HDC hdc, sal_uLong nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry )
@@ -707,7 +707,7 @@ void ImplRenderPath( HDC hdc, sal_uLong nPoints, const SalPoint* pPtAry, const B
}
}
-// =======================================================================
+
WinSalGraphics::WinSalGraphics()
{
@@ -1052,7 +1052,7 @@ bool WinSalGraphics::setClipRegion( const Region& i_rClip )
// debug code if you weant to check range of the newly applied ClipRegion
//RECT aBound;
//const int aRegionType = GetRgnBox(mhRegion, &aBound);
- //
+
//bool bBla = true;
}
else
diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx
index d81229604ebb..a39bf3c3c518 100644
--- a/vcl/win/source/gdi/salgdi2.cxx
+++ b/vcl/win/source/gdi/salgdi2.cxx
@@ -55,7 +55,7 @@ bool WinSalGraphics::supportsOperation( OutDevSupportType eType ) const
return bRet;
}
-// =======================================================================
+
void WinSalGraphics::copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics )
{
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 2fd048fed949..29448a48d47a 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -77,14 +77,14 @@ inline int IntTimes256FromFixed(FIXED f)
return nFixedTimes256;
}
-// =======================================================================
+
// these variables can be static because they store system wide settings
static bool bImplSalCourierScalable = false;
static bool bImplSalCourierNew = false;
-// =======================================================================
+
@@ -228,7 +228,7 @@ void ImplFontAttrCache::AddFontAttr( const OUString& rFontFileName, const ImplDe
}
}
-// =======================================================================
+
// raw font data with a scoped lifetime
class RawFontData
@@ -294,7 +294,7 @@ RawFontData::RawFontData( HDC hDC, DWORD nTableTag )
}
}
-// ===========================================================================
+
// platform specific font substitution hooks for glyph fallback enhancement
// TODO: move into i18n module (maybe merge with svx/ucsubset.*
// or merge with i18nutil/source/utility/unicode_data.h)
@@ -601,7 +601,7 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFon
return bFound;
}
-// =======================================================================
+
struct ImplEnumInfo
{
@@ -618,7 +618,7 @@ struct ImplEnumInfo
int mnFontCount;
};
-// =======================================================================
+
static rtl_TextEncoding ImplCharSetToSal( BYTE nCharSet )
{
@@ -1033,7 +1033,7 @@ void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont )
}
}
-// =======================================================================
+
#if ENABLE_GRAPHITE
#ifdef DEBUG
@@ -1415,7 +1415,7 @@ void ImplWinFontData::GetFontCapabilities( HDC hDC ) const
}
}
-// =======================================================================
+
void WinSalGraphics::SetTextColor( SalColor nSalColor )
{
@@ -2098,7 +2098,7 @@ static bool ImplGetFontAttrFromFile( const OUString& rFontFileURL,
// byte offsets 0x4CE/0x4CF: winascent
// byte offsets 0x4D0/0x4D1: winascent+windescent-emunits
// byte offsets 0x4DF/0x4E0: avgwidth
- //...
+
return true;
}
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 0703bbbbb64a..cfba8a449b1e 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -20,14 +20,14 @@
// General info:
// http://msdn.microsoft.com/en-us/library/windows/desktop/hh270423%28v=vs.85%29.aspx
// http://msdn.microsoft.com/en-us/library/windows/desktop/bb773178%28v=vs.85%29.aspx
-//
+
// Useful tool to explore the themes & their rendering:
// http://privat.rejbrand.se/UxExplore.exe
// (found at http://stackoverflow.com/questions/4009701/windows-visual-themes-gallery-of-parts-and-states/4009712#4009712)
-//
+
// Theme subclasses:
// http://msdn.microsoft.com/en-us/library/windows/desktop/bb773218%28v=vs.85%29.aspx
-//
+
// Drawing in non-client area (general DWM-related info):
// http://msdn.microsoft.com/en-us/library/windows/desktop/bb688195%28v=vs.85%29.aspx
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index cc10cac3fb55..b1dbab938ee9 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -576,7 +576,7 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
//also says that the MS DMPAPER_B4 is JIS, which makes most sense. And
//matches our Excel filter's belief about the matching XlPaperSize
//enumeration.
- //
+
//http://msdn.microsoft.com/en-us/library/ms776398(VS.85).aspx said
////"DMPAPER_B4 12 B4 (JIS) 250 x 354"
//which is bogus as it's either JIS 257 x 364 or ISO 250 x 353
diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx
index 420d312711da..89eaba889d26 100644
--- a/vcl/win/source/gdi/salvd.cxx
+++ b/vcl/win/source/gdi/salvd.cxx
@@ -28,7 +28,7 @@
#include <win/salgdi.h>
#include <win/salvd.h>
-// =======================================================================
+
static HBITMAP ImplCreateVirDevBitmap( HDC hDC, long nDX, long nDY,
sal_uInt16 nBitCount )
@@ -67,7 +67,7 @@ static HBITMAP ImplCreateVirDevBitmap( HDC hDC, long nDX, long nDY,
return hBitmap;
}
-// =======================================================================
+
SalVirtualDevice* WinSalInstance::CreateVirtualDevice( SalGraphics* pSGraphics,
long nDX, long nDY,
@@ -158,7 +158,7 @@ void WinSalInstance::DestroyVirtualDevice( SalVirtualDevice* pDevice )
delete pDevice;
}
-// =======================================================================
+
WinSalVirtualDevice::WinSalVirtualDevice()
{
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 947219a582f7..a3aca6d5c4e4 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -62,7 +62,7 @@ typedef boost::unordered_map<int,int> IntMap;
#include <config_mingw.h>
-// =======================================================================
+
// win32 specific physical font instance
class ImplWinFontEntry : public ImplFontEntry
@@ -117,7 +117,7 @@ inline int ImplWinFontEntry::GetCachedGlyphWidth( int nCharCode ) const
return it->second;
}
-// =======================================================================
+
class WinLayout : public SalLayout
{
@@ -141,7 +141,7 @@ protected:
ImplWinFontEntry& mrWinFontEntry;
};
-// =======================================================================
+
class SimpleWinLayout : public WinLayout
{
@@ -187,7 +187,7 @@ private:
BYTE mnCharSet;
};
-// =======================================================================
+
WinLayout::WinLayout( HDC hDC, const ImplWinFontData& rWFD, ImplWinFontEntry& rWFE )
: mhDC( hDC ),
@@ -229,7 +229,7 @@ HFONT WinLayout::DisableFontScaling() const
return SelectFont( mhDC, hHugeFont );
}
-// =======================================================================
+
SimpleWinLayout::SimpleWinLayout( HDC hDC, BYTE nCharSet,
const ImplWinFontData& rWinFontData, ImplWinFontEntry& rWinFontEntry )
@@ -974,7 +974,7 @@ void SimpleWinLayout::Simplify( bool /*bIsBase*/ )
mnWidth = mnBaseAdv = 0;
}
-// =======================================================================
+
struct VisualItem
{
@@ -1755,7 +1755,7 @@ int UniscribeLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos,
//position so that iterating over glyph slots one at a time for
//glyph fallback can keep context as to what characters are the
//inputs that caused a missing glyph in a given font.
- //
+
//See: fdo#46923/fdo#46896/fdo#46750 for extra complexities
{
int dir = 1;
@@ -2703,7 +2703,7 @@ sal_GlyphId GraphiteLayoutWinImpl::getKashidaGlyph(int & rWidth)
// This class uses the SIL Graphite engine to provide complex text layout services to the VCL
// @author tse
-//
+
class GraphiteWinLayout : public WinLayout
{
private:
@@ -2896,7 +2896,7 @@ void GraphiteWinLayout::Simplify( bool is_base )
maImpl.Simplify(is_base);
}
#endif // ENABLE_GRAPHITE
-// =======================================================================
+
SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel )
{
@@ -2961,7 +2961,7 @@ int WinSalGraphics::GetMinKashidaWidth()
return nMinKashida;
}
-// =======================================================================
+
ImplWinFontEntry::ImplWinFontEntry( FontSelectPattern& rFSD )
: ImplFontEntry( rFSD )
@@ -3045,7 +3045,7 @@ bool ImplWinFontEntry::InitKashidaHandling( HDC hDC )
return true;
}
-// =======================================================================
+
PhysicalFontFace* ImplWinFontData::Clone() const
{
@@ -3067,6 +3067,6 @@ ImplFontEntry* ImplWinFontData::CreateFontInstance( FontSelectPattern& rFSD ) co
return pEntry;
}
-// =======================================================================
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */