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/source/gdi | |
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/source/gdi')
-rw-r--r-- | vcl/source/gdi/bitmap4.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/bitmapex.cxx | 14 | ||||
-rw-r--r-- | vcl/source/gdi/dibtools.cxx | 16 | ||||
-rw-r--r-- | vcl/source/gdi/gdimetafiletools.cxx | 28 | ||||
-rw-r--r-- | vcl/source/gdi/impfont.cxx | 66 | ||||
-rw-r--r-- | vcl/source/gdi/impvect.hxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/metaact.cxx | 112 | ||||
-rw-r--r-- | vcl/source/gdi/metric.cxx | 38 | ||||
-rw-r--r-- | vcl/source/gdi/outdev.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/outdev2.cxx | 10 | ||||
-rw-r--r-- | vcl/source/gdi/outdev3.cxx | 8 | ||||
-rw-r--r-- | vcl/source/gdi/outdev4.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/outdev5.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/outmap.cxx | 164 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 6 | ||||
-rw-r--r-- | vcl/source/gdi/pngread.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/print2.cxx | 50 | ||||
-rw-r--r-- | vcl/source/gdi/print3.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/regband.cxx | 58 | ||||
-rw-r--r-- | vcl/source/gdi/region.cxx | 6 | ||||
-rw-r--r-- | vcl/source/gdi/regionband.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/salgdilayout.cxx | 14 | ||||
-rw-r--r-- | vcl/source/gdi/sallayout.cxx | 18 | ||||
-rw-r--r-- | vcl/source/gdi/svgdata.cxx | 18 | ||||
-rw-r--r-- | vcl/source/gdi/virdev.cxx | 2 |
25 files changed, 327 insertions, 327 deletions
diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx index 509f7ead46ef..1237c5338cd5 100644 --- a/vcl/source/gdi/bitmap4.cxx +++ b/vcl/source/gdi/bitmap4.cxx @@ -1063,11 +1063,11 @@ void Bitmap::ImplBlurContributions( const int aSize, const int aNumberOfContribu } // Separable Gaussian Blur -// + // Separable Gaussian Blur filter and accepts a blur radius // as a parameter so the user can change the strength of the blur. // Radius of 1.0 is 3 * standard deviation of gauss function. -// + // Separable Blur implementation uses 2x separable 1D convolution // to process the image. bool Bitmap::ImplSeparableBlurFilter(const double radius) diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 0e9cd05d7abc..840282eeee29 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -322,7 +322,7 @@ sal_uLong BitmapEx::GetChecksum() const return nCrc; } -// ------------------------------------------------------------------ + void BitmapEx::SetSizePixel( const Size& rNewSize, sal_uInt32 nScaleFlag ) { @@ -362,7 +362,7 @@ bool BitmapEx::Mirror( sal_uLong nMirrorFlags ) return bRet; } -// ------------------------------------------------------------------ + bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) { @@ -386,7 +386,7 @@ bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 n return bRet; } -// ------------------------------------------------------------------------ + bool BitmapEx::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag ) { @@ -828,7 +828,7 @@ bool BitmapEx::Create( const ::com::sun::star::uno::Reference< return false; } -// ------------------------------------------------------------------ + namespace { @@ -925,7 +925,7 @@ BitmapEx BitmapEx::TransformBitmapEx( return BitmapEx(aDestination); } -// ------------------------------------------------------------------ + BitmapEx BitmapEx::getTransformed( const basegfx::B2DHomMatrix& rTransformation, @@ -1009,7 +1009,7 @@ BitmapEx BitmapEx::getTransformed( return aRetval; } -// ------------------------------------------------------------------ + BitmapEx BitmapEx::ModifyBitmapEx(const basegfx::BColorModifierStack& rBColorModifierStack) const { @@ -1167,7 +1167,7 @@ BitmapEx BitmapEx::ModifyBitmapEx(const basegfx::BColorModifierStack& rBColorMod } } -// ----------------------------------------------------------------------------- + BitmapEx VCL_DLLPUBLIC createBlendFrame( const Size& rSize, diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index d0b9c2f92582..9802557b8f4a 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -25,14 +25,14 @@ #include <vcl/bmpacc.hxx> #include <vcl/outdev.hxx> -////////////////////////////////////////////////////////////////////////////// + // - Defines - #define DIBCOREHEADERSIZE ( 12UL ) #define DIBINFOHEADERSIZE ( sizeof(DIBInfoHeader) ) #define DIBV5HEADERSIZE ( sizeof(DIBV5Header) ) -////////////////////////////////////////////////////////////////////////////// + // - Compression defines #define COMPRESS_OWN ('S'|('D'<<8UL)) @@ -42,7 +42,7 @@ #define BITFIELDS ( 3UL ) #define ZCOMPRESS ( COMPRESS_OWN | 0x01000000UL ) /* == 'SD01' (binary) */ -////////////////////////////////////////////////////////////////////////////// + // - DIBInfoHeader and DIBV5Header typedef sal_Int32 FXPT2DOT30; @@ -148,7 +148,7 @@ struct DIBV5Header : public DIBInfoHeader {} }; -////////////////////////////////////////////////////////////////////////////// + namespace { @@ -165,7 +165,7 @@ namespace } } -////////////////////////////////////////////////////////////////////////////// + bool ImplReadDIBInfoHeader(SvStream& rIStm, DIBV5Header& rHeader, bool& bTopDown) { @@ -1315,7 +1315,7 @@ bool ImplWriteDIBFileHeader(SvStream& rOStm, BitmapReadAccess& rAcc, bool bUseDI return( rOStm.GetError() == 0UL ); } -////////////////////////////////////////////////////////////////////////////// + bool ImplReadDIB( Bitmap& rTarget, Bitmap* @@ -1424,7 +1424,7 @@ bool ImplWriteDIB( return bRet; } -////////////////////////////////////////////////////////////////////////////// + bool ReadDIB( Bitmap& rTarget, @@ -1522,7 +1522,7 @@ bool ReadDIBV5( return ImplReadDIB(rTarget, &rTargetAlpha, rIStm, true); } -////////////////////////////////////////////////////////////////////////////// + bool WriteDIB( const Bitmap& rSource, diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx index 45623853bfda..cd918f8a9987 100644 --- a/vcl/source/gdi/gdimetafiletools.cxx +++ b/vcl/source/gdi/gdimetafiletools.cxx @@ -26,7 +26,7 @@ #include <vcl/svapp.hxx> #include <vcl/graphictools.hxx> -////////////////////////////////////////////////////////////////////////////// + // helpers namespace @@ -255,7 +255,7 @@ namespace } } // end of anonymous namespace -////////////////////////////////////////////////////////////////////////////// + // #i121267# Tooling to internally clip geometry against internal clip regions void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) @@ -446,9 +446,9 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) { switch(nType) { - // + // pixel actions, just check on inside - // + case META_PIXEL_ACTION : { const MetaPixelAction* pA = static_cast< const MetaPixelAction* >(pAction); @@ -479,9 +479,9 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) break; } - // + // geometry actions - // + case META_LINE_ACTION : { const MetaLineAction* pA = static_cast< const MetaLineAction* >(pAction); @@ -705,10 +705,10 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) break; } - // + // bitmap actions, create BitmapEx with alpha channel derived // from clipping - // + case META_BMPEX_ACTION : { const MetaBmpExAction* pA = static_cast< const MetaBmpExAction* >(pAction); @@ -857,9 +857,9 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) break; } - // + // need to handle all those 'hacks' which hide data in comments - // + case META_COMMENT_ACTION : { const MetaCommentAction* pA = static_cast< const MetaCommentAction* >(pAction); @@ -963,9 +963,9 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) break; } - // + // need to handle gradient fills (hopefully only unroated ones) - // + case META_GRADIENT_ACTION : { @@ -1007,7 +1007,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) } // not (yet) supported actions - // + // META_NULL_ACTION // META_TEXT_ACTION // META_TEXTARRAY_ACTION @@ -1064,7 +1064,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) } } -////////////////////////////////////////////////////////////////////////////// + bool VCL_DLLPUBLIC usesClipActions(const GDIMetaFile& rSource) { diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx index 2674a1ad95da..e341c813b4a9 100644 --- a/vcl/source/gdi/impfont.cxx +++ b/vcl/source/gdi/impfont.cxx @@ -22,7 +22,7 @@ #include <vector> #include <set> -// ======================================================================= + CmapResult::CmapResult( bool bSymbolic, const sal_UCS4* pRangeCodes, int nRangeCount, @@ -35,7 +35,7 @@ CmapResult::CmapResult( bool bSymbolic, , mbRecoded( false) {} -// ======================================================================= + ImplFontCharMap::ImplFontCharMap( const CmapResult& rCR ) : mpRangeCodes( rCR.mpRangeCodes ) @@ -58,7 +58,7 @@ static ImplFontCharMap* pDefaultImplFontCharMap = NULL; static const sal_UCS4 aDefaultUnicodeRanges[] = {0x0020,0xD800, 0xE000,0xFFF0}; static const sal_UCS4 aDefaultSymbolRanges[] = {0x0020,0x0100, 0xF020,0xF100}; -// ----------------------------------------------------------------------- + bool ImplFontCharMap::IsDefaultMap() const { @@ -66,7 +66,7 @@ bool ImplFontCharMap::IsDefaultMap() const return bIsDefault; } -// ----------------------------------------------------------------------- + ImplFontCharMap::~ImplFontCharMap() { @@ -77,7 +77,7 @@ ImplFontCharMap::~ImplFontCharMap() delete[] mpGlyphIds; } -// ----------------------------------------------------------------------- + ImplFontCharMap* ImplFontCharMap::GetDefaultMap( bool bSymbols) { @@ -100,14 +100,14 @@ ImplFontCharMap* ImplFontCharMap::GetDefaultMap( bool bSymbols) return pDefaultImplFontCharMap; } -// ----------------------------------------------------------------------- + void ImplFontCharMap::AddReference( void) const { ++mnRefCount; } -// ----------------------------------------------------------------------- + void ImplFontCharMap::DeReference( void) const { @@ -116,14 +116,14 @@ void ImplFontCharMap::DeReference( void) const delete this; } -// ----------------------------------------------------------------------- + int ImplFontCharMap::GetCharCount() const { return mnCharCount; } -// ----------------------------------------------------------------------- + int ImplFontCharMap::ImplFindRangeIndex( sal_UCS4 cChar ) const { @@ -142,7 +142,7 @@ int ImplFontCharMap::ImplFindRangeIndex( sal_UCS4 cChar ) const return nMid; } -// ----------------------------------------------------------------------- + bool ImplFontCharMap::HasChar( sal_UCS4 cChar ) const { @@ -161,7 +161,7 @@ bool ImplFontCharMap::HasChar( sal_UCS4 cChar ) const return bHasChar; } -// ----------------------------------------------------------------------- + int ImplFontCharMap::GetGlyphIndex( sal_UCS4 cChar ) const { @@ -198,7 +198,7 @@ int ImplFontCharMap::GetGlyphIndex( sal_UCS4 cChar ) const return nGlyphIndex; } -// ----------------------------------------------------------------------- + // returns the number of chars supported by the font, which // are inside the unicode range from cMin to cMax (inclusive) @@ -227,21 +227,21 @@ int ImplFontCharMap::CountCharsInRange( sal_UCS4 cMin, sal_UCS4 cMax ) const return nCount; } -// ----------------------------------------------------------------------- + sal_UCS4 ImplFontCharMap::GetFirstChar() const { return mpRangeCodes[0]; } -// ----------------------------------------------------------------------- + sal_UCS4 ImplFontCharMap::GetLastChar() const { return (mpRangeCodes[ 2*mnRangeCount-1 ] - 1); } -// ----------------------------------------------------------------------- + sal_UCS4 ImplFontCharMap::GetNextChar( sal_UCS4 cChar ) const { @@ -256,7 +256,7 @@ sal_UCS4 ImplFontCharMap::GetNextChar( sal_UCS4 cChar ) const return (cChar + 1); } -// ----------------------------------------------------------------------- + sal_UCS4 ImplFontCharMap::GetPrevChar( sal_UCS4 cChar ) const { @@ -271,7 +271,7 @@ sal_UCS4 ImplFontCharMap::GetPrevChar( sal_UCS4 cChar ) const return (cChar - 1); } -// ----------------------------------------------------------------------- + int ImplFontCharMap::GetIndexFromChar( sal_UCS4 cChar ) const { @@ -293,7 +293,7 @@ int ImplFontCharMap::GetIndexFromChar( sal_UCS4 cChar ) const return -1; } -// ----------------------------------------------------------------------- + sal_UCS4 ImplFontCharMap::GetCharFromIndex( int nCharIndex ) const { @@ -312,7 +312,7 @@ sal_UCS4 ImplFontCharMap::GetCharFromIndex( int nCharIndex ) const return mpRangeCodes[0]; } -// ======================================================================= + static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);} static unsigned Getsal_uInt16( const unsigned char* p ){ return((p[0]<<8) | p[1]);} @@ -602,13 +602,13 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult ) return true; } -// ======================================================================= + FontCharMap::FontCharMap() : mpImpl( ImplFontCharMap::GetDefaultMap() ) {} -// ----------------------------------------------------------------------- + FontCharMap::~FontCharMap() { @@ -616,21 +616,21 @@ FontCharMap::~FontCharMap() mpImpl = NULL; } -// ----------------------------------------------------------------------- + int FontCharMap::GetCharCount() const { return mpImpl->GetCharCount(); } -// ----------------------------------------------------------------------- + int FontCharMap::CountCharsInRange( sal_UCS4 cMin, sal_UCS4 cMax ) const { return mpImpl->CountCharsInRange( cMin, cMax ); } -// ----------------------------------------------------------------------- + void FontCharMap::Reset( const ImplFontCharMap* pNewMap ) { @@ -647,56 +647,56 @@ void FontCharMap::Reset( const ImplFontCharMap* pNewMap ) } } -// ----------------------------------------------------------------------- + bool FontCharMap::IsDefaultMap() const { return mpImpl->IsDefaultMap(); } -// ----------------------------------------------------------------------- + bool FontCharMap::HasChar( sal_UCS4 cChar ) const { return mpImpl->HasChar( cChar ); } -// ----------------------------------------------------------------------- + sal_UCS4 FontCharMap::GetFirstChar() const { return mpImpl->GetFirstChar(); } -// ----------------------------------------------------------------------- + sal_UCS4 FontCharMap::GetNextChar( sal_UCS4 cChar ) const { return mpImpl->GetNextChar( cChar ); } -// ----------------------------------------------------------------------- + sal_UCS4 FontCharMap::GetPrevChar( sal_UCS4 cChar ) const { return mpImpl->GetPrevChar( cChar ); } -// ----------------------------------------------------------------------- + int FontCharMap::GetIndexFromChar( sal_UCS4 cChar ) const { return mpImpl->GetIndexFromChar( cChar ); } -// ----------------------------------------------------------------------- + sal_UCS4 FontCharMap::GetCharFromIndex( int nIndex ) const { return mpImpl->GetCharFromIndex( nIndex ); } -// ======================================================================= + // on some systems we have to get the font attributes from the name table // since neither head's macStyle nor OS/2's panose are easily available @@ -848,6 +848,6 @@ void UpdateAttributesFromPSName( const OUString& rPSName, ImplDevFontAttributes& } } -// ======================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/impvect.hxx b/vcl/source/gdi/impvect.hxx index 38becc56ddd7..e0d8d4d1a9ef 100644 --- a/vcl/source/gdi/impvect.hxx +++ b/vcl/source/gdi/impvect.hxx @@ -23,9 +23,9 @@ #include <tools/poly.hxx> #include <vcl/gdimtf.hxx> -// -------------- + // - Vectorizer - -// -------------- + class BitmapReadAccess; class ImplChain; diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index e3977355321b..ebf9eb8fb634 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -30,7 +30,7 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <unotools/fontdefs.hxx> -// ======================================================================== + inline void ImplScalePoint( Point& rPt, double fScaleX, double fScaleY ) { @@ -75,14 +75,14 @@ inline void ImplScaleLineInfo( LineInfo& rLineInfo, double fScaleX, double fScal } } -// ======================================================================== + #define COMPAT( _def_rIStm ) VersionCompat aCompat( ( _def_rIStm ), STREAM_READ ); #define WRITE_BASE_COMPAT( _def_rOStm, _def_nVer, _pWriteData ) \ MetaAction::Write( ( _def_rOStm ), _pWriteData ); \ VersionCompat aCompat( ( _def_rOStm ), STREAM_WRITE, ( _def_nVer ) ); -// ======================================================================== + MetaAction::MetaAction() : mnRefCount( 1 ), @@ -233,7 +233,7 @@ MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData return pAction; } -// ======================================================================== + IMPL_META_ACTION( Pixel, META_PIXEL_ACTION ) @@ -302,7 +302,7 @@ void MetaPixelAction::Read( SvStream& rIStm, ImplMetaReadData* ) maColor.Read( rIStm, true ); } -// ======================================================================== + IMPL_META_ACTION( Point, META_POINT_ACTION ) @@ -367,7 +367,7 @@ void MetaPointAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maPt ); } -// ======================================================================== + IMPL_META_ACTION( Line, META_LINE_ACTION ) @@ -464,7 +464,7 @@ void MetaLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } -// ======================================================================== + IMPL_META_ACTION( Rect, META_RECT_ACTION ) @@ -529,7 +529,7 @@ void MetaRectAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadRectangle( rIStm, maRect ); } -// ======================================================================== + IMPL_META_ACTION( RoundRect, META_ROUNDRECT_ACTION ) @@ -602,7 +602,7 @@ void MetaRoundRectAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadRectangle( rIStm, maRect ).ReadUInt32( mnHorzRound ).ReadUInt32( mnVertRound ); } -// ======================================================================== + IMPL_META_ACTION( Ellipse, META_ELLIPSE_ACTION ) @@ -667,7 +667,7 @@ void MetaEllipseAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadRectangle( rIStm, maRect ); } -// ======================================================================== + IMPL_META_ACTION( Arc, META_ARC_ACTION ) @@ -745,7 +745,7 @@ void MetaArcAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maEndPt ); } -// ======================================================================== + IMPL_META_ACTION( Pie, META_PIE_ACTION ) @@ -823,7 +823,7 @@ void MetaPieAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maEndPt ); } -// ======================================================================== + IMPL_META_ACTION( Chord, META_CHORD_ACTION ) @@ -901,7 +901,7 @@ void MetaChordAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maEndPt ); } -// ======================================================================== + IMPL_META_ACTION( PolyLine, META_POLYLINE_ACTION ) @@ -1008,7 +1008,7 @@ void MetaPolyLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } -// ======================================================================== + IMPL_META_ACTION( Polygon, META_POLYGON_ACTION ) @@ -1090,7 +1090,7 @@ void MetaPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } -// ======================================================================== + IMPL_META_ACTION( PolyPolygon, META_POLYPOLYGON_ACTION ) @@ -1195,7 +1195,7 @@ void MetaPolyPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } -// ======================================================================== + IMPL_META_ACTION( Text, META_TEXT_ACTION ) @@ -1278,7 +1278,7 @@ void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) maStr = read_uInt16_lenPrefixed_uInt16s_ToOUString(rIStm); } -// ======================================================================== + MetaTextArrayAction::MetaTextArrayAction() : MetaAction ( META_TEXTARRAY_ACTION ), @@ -1465,7 +1465,7 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) } } -// ======================================================================== + IMPL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION ) @@ -1554,7 +1554,7 @@ void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) maStr = read_uInt16_lenPrefixed_uInt16s_ToOUString(rIStm); } -// ======================================================================== + IMPL_META_ACTION( TextRect, META_TEXTRECT_ACTION ) @@ -1633,7 +1633,7 @@ void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) maStr = read_uInt16_lenPrefixed_uInt16s_ToOUString(rIStm); } -// ======================================================================== + IMPL_META_ACTION( TextLine, META_TEXTLINE_ACTION ) @@ -1731,7 +1731,7 @@ void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } -// ======================================================================== + IMPL_META_ACTION( Bmp, META_BMP_ACTION ) @@ -1803,7 +1803,7 @@ void MetaBmpAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maPt ); } -// ======================================================================== + IMPL_META_ACTION( BmpScale, META_BMPSCALE_ACTION ) @@ -1883,7 +1883,7 @@ void MetaBmpScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSz ); } -// ======================================================================== + IMPL_META_ACTION( BmpScalePart, META_BMPSCALEPART_ACTION ) @@ -1972,7 +1972,7 @@ void MetaBmpScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSrcSz ); } -// ======================================================================== + IMPL_META_ACTION( BmpEx, META_BMPEX_ACTION ) @@ -2044,7 +2044,7 @@ void MetaBmpExAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maPt ); } -// ======================================================================== + IMPL_META_ACTION( BmpExScale, META_BMPEXSCALE_ACTION ) @@ -2124,7 +2124,7 @@ void MetaBmpExScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSz ); } -// ======================================================================== + IMPL_META_ACTION( BmpExScalePart, META_BMPEXSCALEPART_ACTION ) @@ -2213,7 +2213,7 @@ void MetaBmpExScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSrcSz ); } -// ======================================================================== + IMPL_META_ACTION( Mask, META_MASK_ACTION ) @@ -2289,7 +2289,7 @@ void MetaMaskAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maPt ); } -// ======================================================================== + IMPL_META_ACTION( MaskScale, META_MASKSCALE_ACTION ) @@ -2372,7 +2372,7 @@ void MetaMaskScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSz ); } -// ======================================================================== + IMPL_META_ACTION( MaskScalePart, META_MASKSCALEPART_ACTION ) @@ -2466,7 +2466,7 @@ void MetaMaskScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSrcSz ); } -// ======================================================================== + IMPL_META_ACTION( Gradient, META_GRADIENT_ACTION ) @@ -2535,7 +2535,7 @@ void MetaGradientAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadGradient( rIStm, maGradient ); } -// ======================================================================== + MetaGradientExAction::MetaGradientExAction() : MetaAction ( META_GRADIENTEX_ACTION ) @@ -2623,7 +2623,7 @@ void MetaGradientExAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadGradient( rIStm, maGradient ); } -// ======================================================================== + IMPL_META_ACTION( Hatch, META_HATCH_ACTION ) @@ -2698,7 +2698,7 @@ void MetaHatchAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadHatch( rIStm, maHatch ); } -// ======================================================================== + IMPL_META_ACTION( Wallpaper, META_WALLPAPER_ACTION ) @@ -2766,7 +2766,7 @@ void MetaWallpaperAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadWallpaper( rIStm, maWallpaper ); } -// ======================================================================== + IMPL_META_ACTION( ClipRegion, META_CLIPREGION_ACTION ) @@ -2838,7 +2838,7 @@ void MetaClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbClip ); } -// ======================================================================== + IMPL_META_ACTION( ISectRectClipRegion, META_ISECTRECTCLIPREGION_ACTION ) @@ -2903,7 +2903,7 @@ void MetaISectRectClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadRectangle( rIStm, maRect ); } -// ======================================================================== + IMPL_META_ACTION( ISectRegionClipRegion, META_ISECTREGIONCLIPREGION_ACTION ) @@ -2968,7 +2968,7 @@ void MetaISectRegionClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadRegion( rIStm, maRegion ); } -// ======================================================================== + IMPL_META_ACTION( MoveClipRegion, META_MOVECLIPREGION_ACTION ) @@ -3034,7 +3034,7 @@ void MetaMoveClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) mnVertMove = nTmpVM; } -// ======================================================================== + IMPL_META_ACTION( LineColor, META_LINECOLOR_ACTION ) @@ -3092,7 +3092,7 @@ void MetaLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } -// ======================================================================== + IMPL_META_ACTION( FillColor, META_FILLCOLOR_ACTION ) @@ -3150,7 +3150,7 @@ void MetaFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } -// ======================================================================== + IMPL_META_ACTION( TextColor, META_TEXTCOLOR_ACTION ) @@ -3201,7 +3201,7 @@ void MetaTextColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) maColor.Read( rIStm, true ); } -// ======================================================================== + IMPL_META_ACTION( TextFillColor, META_TEXTFILLCOLOR_ACTION ) @@ -3259,7 +3259,7 @@ void MetaTextFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } -// ======================================================================== + IMPL_META_ACTION( TextLineColor, META_TEXTLINECOLOR_ACTION ) @@ -3317,7 +3317,7 @@ void MetaTextLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } -// ======================================================================== + IMPL_META_ACTION( OverlineColor, META_OVERLINECOLOR_ACTION ) @@ -3375,7 +3375,7 @@ void MetaOverlineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } -// ======================================================================== + IMPL_META_ACTION( TextAlign, META_TEXTALIGN_ACTION ) @@ -3428,7 +3428,7 @@ void MetaTextAlignAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadUInt16( nTmp16 ); maAlign = (TextAlign) nTmp16; } -// ======================================================================== + IMPL_META_ACTION( MapMode, META_MAPMODE_ACTION ) @@ -3489,7 +3489,7 @@ void MetaMapModeAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadMapMode( rIStm, maMapMode ); } -// ======================================================================== + IMPL_META_ACTION( Font, META_FONT_ACTION ) @@ -3565,7 +3565,7 @@ void MetaFontAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) pData->meActualCharSet = osl_getThreadTextEncoding(); } -// ======================================================================== + IMPL_META_ACTION( Push, META_PUSH_ACTION ) @@ -3616,7 +3616,7 @@ void MetaPushAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadUInt16( mnFlags ); } -// ======================================================================== + IMPL_META_ACTION( Pop, META_POP_ACTION ) @@ -3650,7 +3650,7 @@ void MetaPopAction::Read( SvStream& rIStm, ImplMetaReadData* ) COMPAT( rIStm ); } -// ======================================================================== + IMPL_META_ACTION( RasterOp, META_RASTEROP_ACTION ) @@ -3703,7 +3703,7 @@ void MetaRasterOpAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadUInt16( nTmp16 ); meRasterOp = (RasterOp) nTmp16; } -// ======================================================================== + IMPL_META_ACTION( Transparent, META_TRANSPARENT_ACTION ) @@ -3786,7 +3786,7 @@ void MetaTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadUInt16( mnTransPercent ); } -// ======================================================================== + IMPL_META_ACTION( FloatTransparent, META_FLOATTRANSPARENT_ACTION ) @@ -3868,7 +3868,7 @@ void MetaFloatTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadGradient( rIStm, maGradient ); } -// ======================================================================== + IMPL_META_ACTION( EPS, META_EPS_ACTION ) @@ -3949,7 +3949,7 @@ void MetaEPSAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadGDIMetaFile( rIStm, maSubst ); } -// ======================================================================== + IMPL_META_ACTION( RefPoint, META_REFPOINT_ACTION ) @@ -4006,7 +4006,7 @@ void MetaRefPointAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maRefPoint ).ReadCharAsBool( mbSet ); } -// ======================================================================== + MetaCommentAction::MetaCommentAction( sal_Int32 nValue ) : MetaAction ( META_COMMENT_ACTION ), @@ -4240,7 +4240,7 @@ void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* ) mpData = NULL; } -// ======================================================================== + IMPL_META_ACTION( LayoutMode, META_LAYOUTMODE_ACTION ) @@ -4291,7 +4291,7 @@ void MetaLayoutModeAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadUInt32( mnLayoutMode ); } -// ======================================================================== + IMPL_META_ACTION( TextLanguage, META_TEXTLANGUAGE_ACTION ) diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx index 0ddf5ec69e1c..b1b0e8b568ac 100644 --- a/vcl/source/gdi/metric.cxx +++ b/vcl/source/gdi/metric.cxx @@ -26,7 +26,7 @@ #include <cstdio> -// ======================================================================= + ImplFontMetric::ImplFontMetric() : mnAscent( 0 ), @@ -39,7 +39,7 @@ ImplFontMetric::ImplFontMetric() mnRefCount( 1 ) {} -// ----------------------------------------------------------------------- + inline void ImplFontMetric::AddReference() { @@ -47,7 +47,7 @@ inline void ImplFontMetric::AddReference() ++mnRefCount; } -// ----------------------------------------------------------------------- + inline void ImplFontMetric::DeReference() { @@ -56,7 +56,7 @@ inline void ImplFontMetric::DeReference() delete this; } -// ----------------------------------------------------------------------- + bool ImplFontMetric::operator==( const ImplFontMetric& r ) const { @@ -76,13 +76,13 @@ bool ImplFontMetric::operator==( const ImplFontMetric& r ) const return true; } -// ======================================================================= + FontInfo::FontInfo() : mpImplMetric( new ImplFontMetric ) {} -// ----------------------------------------------------------------------- + FontInfo::FontInfo( const FontInfo& rInfo ) : Font( rInfo ) @@ -91,14 +91,14 @@ FontInfo::FontInfo( const FontInfo& rInfo ) mpImplMetric->AddReference(); } -// ----------------------------------------------------------------------- + FontInfo::~FontInfo() { mpImplMetric->DeReference(); } -// ----------------------------------------------------------------------- + FontInfo& FontInfo::operator=( const FontInfo& rInfo ) { @@ -114,7 +114,7 @@ FontInfo& FontInfo::operator=( const FontInfo& rInfo ) return *this; } -// ----------------------------------------------------------------------- + bool FontInfo::operator==( const FontInfo& rInfo ) const { @@ -127,7 +127,7 @@ bool FontInfo::operator==( const FontInfo& rInfo ) const return false; } -// ----------------------------------------------------------------------- + FontType FontInfo::GetType() const { @@ -138,49 +138,49 @@ FontMetric::FontMetric( const FontMetric& rMetric ) : FontInfo( rMetric ) {} -// ----------------------------------------------------------------------- + long FontMetric::GetAscent() const { return mpImplMetric->GetAscent(); } -// ----------------------------------------------------------------------- + long FontMetric::GetDescent() const { return mpImplMetric->GetDescent(); } -// ----------------------------------------------------------------------- + long FontMetric::GetIntLeading() const { return mpImplMetric->GetIntLeading(); } -// ----------------------------------------------------------------------- + long FontMetric::GetExtLeading() const { return mpImplMetric->GetExtLeading(); } -// ----------------------------------------------------------------------- + long FontMetric::GetLineHeight() const { return mpImplMetric->GetLineHeight(); } -// ----------------------------------------------------------------------- + long FontMetric::GetSlant() const { return mpImplMetric->GetSlant(); } -// ----------------------------------------------------------------------- + FontMetric& FontMetric::operator =( const FontMetric& rMetric ) { @@ -188,13 +188,13 @@ FontMetric& FontMetric::operator =( const FontMetric& rMetric ) return *this; } -// ----------------------------------------------------------------------- + bool FontMetric::operator==( const FontMetric& rMetric ) const { return FontInfo::operator==( rMetric ); } -// ======================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx index 439e385f5b94..ec309f9c90fd 100644 --- a/vcl/source/gdi/outdev.cxx +++ b/vcl/source/gdi/outdev.cxx @@ -1740,14 +1740,14 @@ void OutputDevice::ImpDrawPolyLineWithLineInfo(const Polygon& rPoly, const LineI Polygon aPoly = ImplLogicToDevicePixel( rPoly ); // #100127# LineInfo is not curve-safe, subdivide always - // + // What shall this mean? It's wrong to subdivide here when the // polygon is a fat line. In that case, the painted geometry // WILL be much different. // I also have no idea how this could be related to the given ID // which reads 'consolidate boost versions' in the task description. // Removing. - // + //if( aPoly.HasFlags() ) //{ // aPoly = ImplSubdivideBezier( aPoly ); diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx index a5e2c57e6f0d..b3d074b454ed 100644 --- a/vcl/source/gdi/outdev2.cxx +++ b/vcl/source/gdi/outdev2.cxx @@ -1714,7 +1714,7 @@ inline BitmapColor lcl_AlphaBlend( int nX, int nY, const sal_uInt8 nDstAlpha = 255 - pAlphaW->GetPixelIndex( nY, nX ); // Perform porter-duff compositing 'over' operation - // + // Co = Cs + Cd*(1-As) // Ad = As + Ad*(1-As) nResAlpha = (int)nSrcAlpha + (int)nDstAlpha - (int)nDstAlpha*nSrcAlpha/255; @@ -2270,14 +2270,14 @@ void OutputDevice::ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask //Region aWorkRgn( aMask.CreateRegion( COL_BLACK, Rectangle( Point(), aMask.GetSizePixel() ) ) ); //ImplRegionInfo aInfo; //sal_Bool bRgnRect = aWorkRgn.ImplGetFirstRect( aInfo, nWorkX, nWorkY, nWorkWidth, nWorkHeight ); - // + //while( bRgnRect ) //{ // Bitmap aBandBmp( aPaint ); // const Rectangle aBandRect( Point( nWorkX, nWorkY ), Size( nWorkWidth, nWorkHeight ) ); // const Point aMapPt( pMapX[ nWorkX ], pMapY[ nWorkY ] ); // const Size aMapSz( pMapX[ nWorkX + nWorkWidth ] - aMapPt.X(), pMapY[ nWorkY + nWorkHeight ] - aMapPt.Y() ); - // + // aBandBmp.Crop( aBandRect ); // ImplDrawBitmap( aMapPt, aMapSz, Point(), aBandBmp.GetSizePixel(), aBandBmp, META_BMPSCALEPART_ACTION ); // bRgnRect = aWorkRgn.ImplGetNextRect( aInfo, nWorkX, nWorkY, nWorkWidth, nWorkHeight ); @@ -2374,12 +2374,12 @@ void OutputDevice::ImplPrintMask( const Bitmap& rMask, const Color& rMaskColor, //Region aWorkRgn( aMask.CreateRegion( COL_BLACK, Rectangle( Point(), aMask.GetSizePixel() ) ) ); //ImplRegionInfo aInfo; //sal_Bool bRgnRect = aWorkRgn.ImplGetFirstRect( aInfo, nWorkX, nWorkY, nWorkWidth, nWorkHeight ); - // + //while( bRgnRect ) //{ // const Point aMapPt( pMapX[ nWorkX ], pMapY[ nWorkY ] ); // const Size aMapSz( pMapX[ nWorkX + nWorkWidth ] - aMapPt.X(), pMapY[ nWorkY + nWorkHeight ] - aMapPt.Y() ); - // + // DrawRect( Rectangle( aMapPt, aMapSz ) ); // bRgnRect = aWorkRgn.ImplGetNextRect( aInfo, nWorkX, nWorkY, nWorkWidth, nWorkHeight ); //} diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 833caaa1bb00..de7261033153 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -4732,10 +4732,10 @@ long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, { // Whether hyphen or not: Put the word after the hyphen through // word boundary. - // + // nMaxBreakPos the last char that fits into the line // nBreakPos is the word's start - // + // We run into a problem if the doc is so narrow, that a word // is broken into more than two lines ... if ( xHyph.is() ) @@ -4774,10 +4774,10 @@ long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, // We can have two cases: // 1) "packen" turns into "pak-ken" // 2) "Schiffahrt" turns into "Schiff-fahrt" - // + // In case 1 we need to replace a char // In case 2 we add a char - // + // Correct recognition is made harder by words such as // "Schiffahrtsbrennesseln", as the Hyphenator splits all // positions of the word and comes up with "Schifffahrtsbrennnesseln" diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx index c9a3e6369dda..2422dc27ef77 100644 --- a/vcl/source/gdi/outdev4.cxx +++ b/vcl/source/gdi/outdev4.cxx @@ -362,7 +362,7 @@ void OutputDevice::ImplDrawComplexGradient( const Rectangle& rRect, // Also for printers always use PolyPolygon, as not all printers // can print polygons on top of each other. // Also virtual devices are excluded, as some drivers are too slow. - // + PolyPolygon* pPolyPoly; Rectangle aRect; Point aCenter; diff --git a/vcl/source/gdi/outdev5.cxx b/vcl/source/gdi/outdev5.cxx index 830a1ee3748e..5e6fa7f8fa3b 100644 --- a/vcl/source/gdi/outdev5.cxx +++ b/vcl/source/gdi/outdev5.cxx @@ -31,10 +31,10 @@ #include <outdata.hxx> #include <outdev.h> -// ======================================================================= -// ======================================================================= + + void OutputDevice::DrawRect( const Rectangle& rRect, sal_uLong nHorzRound, sal_uLong nVertRound ) diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx index ba9fd16d9c06..57146b4ed212 100644 --- a/vcl/source/gdi/outmap.cxx +++ b/vcl/source/gdi/outmap.cxx @@ -42,10 +42,10 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -// ======================================================================= -// ======================================================================= + + static int const s_ImplArySize = MAP_PIXEL+1; static const long aImplNumeratorAry[s_ImplArySize] = @@ -53,7 +53,7 @@ static const long aImplNumeratorAry[s_ImplArySize] = static const long aImplDenominatorAry[s_ImplArySize] = { 2540, 254, 127, 127, 1000, 100, 10, 1, 72, 1440, 1 }; -// ----------------------------------------------------------------------- + /* Reduces accuracy until it is a fraction (should become @@ -97,7 +97,7 @@ static Fraction ImplMakeFraction( long nN1, long nN2, long nD1, long nD2 ) return aF; } -// ----------------------------------------------------------------------- + // Fraction.GetNumerator() // Fraction.GetDenominator() > 0 @@ -165,7 +165,7 @@ static void ImplCalcBigIntThreshold( long nDPIX, long nDPIY, rThresRes.mnThresPixToLogY /= 2; } -// ----------------------------------------------------------------------- + static void ImplCalcMapResolution( const MapMode& rMapMode, long nDPIX, long nDPIY, ImplMapRes& rMapRes ) @@ -348,7 +348,7 @@ static void ImplCalcMapResolution( const MapMode& rMapMode, } } -// ----------------------------------------------------------------------- + inline void ImplCalcMapResolution( const MapMode& rMapMode, long nDPIX, long nDPIY, @@ -359,7 +359,7 @@ inline void ImplCalcMapResolution( const MapMode& rMapMode, ImplCalcBigIntThreshold( nDPIX, nDPIY, rMapRes, rThresRes ); } -// ----------------------------------------------------------------------- + static long ImplLogicToPixel( long n, long nDPI, long nMapNum, long nMapDenom, long nThres ) @@ -395,7 +395,7 @@ static long ImplLogicToPixel( long n, long nDPI, long nMapNum, long nMapDenom, return n; } -// ----------------------------------------------------------------------- + static long ImplPixelToLogic( long n, long nDPI, long nMapNum, long nMapDenom, long nThres ) @@ -417,7 +417,7 @@ static long ImplPixelToLogic( long n, long nDPI, long nMapNum, long nMapDenom, return (n / 2); } -// ----------------------------------------------------------------------- + long OutputDevice::ImplLogicXToDevicePixel( long nX ) const { @@ -429,7 +429,7 @@ long OutputDevice::ImplLogicXToDevicePixel( long nX ) const maThresRes.mnThresLogToPixX )+mnOutOffX+mnOutOffOrigX; } -// ----------------------------------------------------------------------- + long OutputDevice::ImplLogicYToDevicePixel( long nY ) const { @@ -441,7 +441,7 @@ long OutputDevice::ImplLogicYToDevicePixel( long nY ) const maThresRes.mnThresLogToPixY )+mnOutOffY+mnOutOffOrigY; } -// ----------------------------------------------------------------------- + long OutputDevice::ImplLogicWidthToDevicePixel( long nWidth ) const { @@ -453,7 +453,7 @@ long OutputDevice::ImplLogicWidthToDevicePixel( long nWidth ) const maThresRes.mnThresLogToPixX ); } -// ----------------------------------------------------------------------- + long OutputDevice::ImplLogicHeightToDevicePixel( long nHeight ) const { @@ -473,7 +473,7 @@ float OutputDevice::ImplFloatLogicHeightToDevicePixel( float fLogicHeight) const return fPixelHeight; } -// ----------------------------------------------------------------------- + long OutputDevice::ImplDevicePixelToLogicWidth( long nWidth ) const { @@ -485,7 +485,7 @@ long OutputDevice::ImplDevicePixelToLogicWidth( long nWidth ) const maThresRes.mnThresPixToLogX ); } -// ----------------------------------------------------------------------- + long OutputDevice::ImplDevicePixelToLogicHeight( long nHeight ) const { @@ -497,7 +497,7 @@ long OutputDevice::ImplDevicePixelToLogicHeight( long nHeight ) const maThresRes.mnThresPixToLogY ); } -// ----------------------------------------------------------------------- + Point OutputDevice::ImplLogicToDevicePixel( const Point& rLogicPt ) const { @@ -512,7 +512,7 @@ Point OutputDevice::ImplLogicToDevicePixel( const Point& rLogicPt ) const maThresRes.mnThresLogToPixY )+mnOutOffY+mnOutOffOrigY ); } -// ----------------------------------------------------------------------- + Size OutputDevice::ImplLogicToDevicePixel( const Size& rLogicSize ) const { @@ -527,7 +527,7 @@ Size OutputDevice::ImplLogicToDevicePixel( const Size& rLogicSize ) const maThresRes.mnThresLogToPixY ) ); } -// ----------------------------------------------------------------------- + Rectangle OutputDevice::ImplLogicToDevicePixel( const Rectangle& rLogicRect ) const { @@ -554,7 +554,7 @@ Rectangle OutputDevice::ImplLogicToDevicePixel( const Rectangle& rLogicRect ) co maThresRes.mnThresLogToPixY )+mnOutOffY+mnOutOffOrigY ); } -// ----------------------------------------------------------------------- + Polygon OutputDevice::ImplLogicToDevicePixel( const Polygon& rLogicPoly ) const { @@ -597,7 +597,7 @@ Polygon OutputDevice::ImplLogicToDevicePixel( const Polygon& rLogicPoly ) const return aPoly; } -// ----------------------------------------------------------------------- + PolyPolygon OutputDevice::ImplLogicToDevicePixel( const PolyPolygon& rLogicPolyPoly ) const { @@ -614,7 +614,7 @@ PolyPolygon OutputDevice::ImplLogicToDevicePixel( const PolyPolygon& rLogicPolyP return aPolyPoly; } -// ----------------------------------------------------------------------- + LineInfo OutputDevice::ImplLogicToDevicePixel( const LineInfo& rLineInfo ) const { @@ -643,7 +643,7 @@ LineInfo OutputDevice::ImplLogicToDevicePixel( const LineInfo& rLineInfo ) const return aInfo; } -// ----------------------------------------------------------------------- + Rectangle OutputDevice::ImplDevicePixelToLogic( const Rectangle& rPixelRect ) const { @@ -670,7 +670,7 @@ Rectangle OutputDevice::ImplDevicePixelToLogic( const Rectangle& rPixelRect ) co maThresRes.mnThresPixToLogY )-maMapRes.mnMapOfsY ); } -// ----------------------------------------------------------------------- + Region OutputDevice::ImplPixelToDevicePixel( const Region& rRegion ) const { @@ -682,7 +682,7 @@ Region OutputDevice::ImplPixelToDevicePixel( const Region& rRegion ) const return aRegion; } -// ----------------------------------------------------------------------- + void OutputDevice::EnableMapMode( bool bEnable ) { @@ -692,7 +692,7 @@ void OutputDevice::EnableMapMode( bool bEnable ) mpAlphaVDev->EnableMapMode( bEnable ); } -// ----------------------------------------------------------------------- + void OutputDevice::SetMapMode() { @@ -726,7 +726,7 @@ void OutputDevice::SetMapMode() mpAlphaVDev->SetMapMode(); } -// ----------------------------------------------------------------------- + void OutputDevice::SetMapMode( const MapMode& rNewMapMode ) { @@ -826,7 +826,7 @@ void OutputDevice::SetMapMode( const MapMode& rNewMapMode ) ImplInvalidateViewTransform(); } -// ----------------------------------------------------------------------- + void OutputDevice::SetRelativeMapMode( const MapMode& rNewMapMode ) { @@ -899,7 +899,7 @@ void OutputDevice::SetRelativeMapMode( const MapMode& rNewMapMode ) mpAlphaVDev->SetRelativeMapMode( rNewMapMode ); } -// ----------------------------------------------------------------------- + // #i75163# basegfx::B2DHomMatrix OutputDevice::GetViewTransformation() const @@ -935,7 +935,7 @@ basegfx::B2DHomMatrix OutputDevice::GetViewTransformation() const } } -// ----------------------------------------------------------------------- + // #i75163# basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation() const @@ -963,7 +963,7 @@ basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation() const } } -// ----------------------------------------------------------------------- + // #i75163# basegfx::B2DHomMatrix OutputDevice::GetViewTransformation( const MapMode& rMapMode ) const @@ -988,7 +988,7 @@ basegfx::B2DHomMatrix OutputDevice::GetViewTransformation( const MapMode& rMapMo return aTransform; } -// ----------------------------------------------------------------------- + // #i75163# basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation( const MapMode& rMapMode ) const @@ -998,7 +998,7 @@ basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation( const MapMode& return aMatrix; } -// ----------------------------------------------------------------------- + basegfx::B2DHomMatrix OutputDevice::ImplGetDeviceTransformation() const { @@ -1009,7 +1009,7 @@ basegfx::B2DHomMatrix OutputDevice::ImplGetDeviceTransformation() const return aTransformation; } -// ----------------------------------------------------------------------- + Point OutputDevice::LogicToPixel( const Point& rLogicPt ) const { @@ -1025,7 +1025,7 @@ Point OutputDevice::LogicToPixel( const Point& rLogicPt ) const maThresRes.mnThresLogToPixY )+mnOutOffOrigY ); } -// ----------------------------------------------------------------------- + Size OutputDevice::LogicToPixel( const Size& rLogicSize ) const { @@ -1041,7 +1041,7 @@ Size OutputDevice::LogicToPixel( const Size& rLogicSize ) const maThresRes.mnThresLogToPixY ) ); } -// ----------------------------------------------------------------------- + Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect ) const { @@ -1063,7 +1063,7 @@ Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect ) const maThresRes.mnThresLogToPixY )+mnOutOffOrigY ); } -// ----------------------------------------------------------------------- + Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly ) const { @@ -1094,7 +1094,7 @@ Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly ) const return aPoly; } -// ----------------------------------------------------------------------- + PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly ) const { @@ -1112,7 +1112,7 @@ PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly ) cons return aPolyPoly; } -// ----------------------------------------------------------------------- + basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogicPoly ) const { @@ -1122,7 +1122,7 @@ basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogi return aTransformedPoly; } -// ----------------------------------------------------------------------- + basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly ) const { @@ -1132,7 +1132,7 @@ basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygo return aTransformedPoly; } -// ----------------------------------------------------------------------- + Region OutputDevice::LogicToPixel( const Region& rLogicRegion ) const { @@ -1168,7 +1168,7 @@ Region OutputDevice::LogicToPixel( const Region& rLogicRegion ) const return aRegion; } -// ----------------------------------------------------------------------- + Point OutputDevice::LogicToPixel( const Point& rLogicPt, const MapMode& rMapMode ) const @@ -1190,7 +1190,7 @@ Point OutputDevice::LogicToPixel( const Point& rLogicPt, aThresRes.mnThresLogToPixY )+mnOutOffOrigY ); } -// ----------------------------------------------------------------------- + Size OutputDevice::LogicToPixel( const Size& rLogicSize, const MapMode& rMapMode ) const @@ -1212,7 +1212,7 @@ Size OutputDevice::LogicToPixel( const Size& rLogicSize, aThresRes.mnThresLogToPixY ) ); } -// ----------------------------------------------------------------------- + Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect, const MapMode& rMapMode ) const @@ -1240,7 +1240,7 @@ Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect, aThresRes.mnThresLogToPixY )+mnOutOffOrigY ); } -// ----------------------------------------------------------------------- + Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly, const MapMode& rMapMode ) const @@ -1277,7 +1277,7 @@ Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly, return aPoly; } -// ----------------------------------------------------------------------- + PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly, const MapMode& rMapMode ) const @@ -1296,7 +1296,7 @@ PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly, return aPolyPoly; } -// ----------------------------------------------------------------------- + basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly, const MapMode& rMapMode ) const @@ -1307,7 +1307,7 @@ basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygo return aTransformedPoly; } -// ----------------------------------------------------------------------- + basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogicPoly, const MapMode& rMapMode ) const @@ -1318,7 +1318,7 @@ basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogi return aTransformedPoly; } -// ----------------------------------------------------------------------- + Region OutputDevice::LogicToPixel( const Region& rLogicRegion, const MapMode& rMapMode ) const { @@ -1354,7 +1354,7 @@ Region OutputDevice::LogicToPixel( const Region& rLogicRegion, const MapMode& rM return aRegion; } -// ----------------------------------------------------------------------- + Point OutputDevice::PixelToLogic( const Point& rDevicePt ) const { @@ -1370,7 +1370,7 @@ Point OutputDevice::PixelToLogic( const Point& rDevicePt ) const maThresRes.mnThresPixToLogY ) - maMapRes.mnMapOfsY - mnOutOffLogicY ); } -// ----------------------------------------------------------------------- + Size OutputDevice::PixelToLogic( const Size& rDeviceSize ) const { @@ -1386,7 +1386,7 @@ Size OutputDevice::PixelToLogic( const Size& rDeviceSize ) const maThresRes.mnThresPixToLogY ) ); } -// ----------------------------------------------------------------------- + Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect ) const { @@ -1408,7 +1408,7 @@ Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect ) const maThresRes.mnThresPixToLogY ) - maMapRes.mnMapOfsY - mnOutOffLogicY ); } -// ----------------------------------------------------------------------- + Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly ) const { @@ -1439,7 +1439,7 @@ Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly ) const return aPoly; } -// ----------------------------------------------------------------------- + PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly ) const { @@ -1465,7 +1465,7 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygo return aTransformedPoly; } -// ----------------------------------------------------------------------- + Region OutputDevice::PixelToLogic( const Region& rDeviceRegion ) const { @@ -1501,7 +1501,7 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion ) const return aRegion; } -// ----------------------------------------------------------------------- + Point OutputDevice::PixelToLogic( const Point& rDevicePt, const MapMode& rMapMode ) const @@ -1524,7 +1524,7 @@ Point OutputDevice::PixelToLogic( const Point& rDevicePt, aThresRes.mnThresPixToLogY ) - aMapRes.mnMapOfsY - mnOutOffLogicY ); } -// ----------------------------------------------------------------------- + Size OutputDevice::PixelToLogic( const Size& rDeviceSize, const MapMode& rMapMode ) const @@ -1547,7 +1547,7 @@ Size OutputDevice::PixelToLogic( const Size& rDeviceSize, aThresRes.mnThresPixToLogY ) ); } -// ----------------------------------------------------------------------- + Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect, const MapMode& rMapMode ) const @@ -1576,7 +1576,7 @@ Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect, aThresRes.mnThresPixToLogY ) - aMapRes.mnMapOfsY - mnOutOffLogicY ); } -// ----------------------------------------------------------------------- + Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly, const MapMode& rMapMode ) const @@ -1614,7 +1614,7 @@ Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly, return aPoly; } -// ----------------------------------------------------------------------- + PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly, const MapMode& rMapMode ) const @@ -1633,7 +1633,7 @@ PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly, return aPolyPoly; } -// ----------------------------------------------------------------------- + basegfx::B2DPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolygon& rPixelPoly, const MapMode& rMapMode ) const @@ -1644,7 +1644,7 @@ basegfx::B2DPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolygon& rPixe return aTransformedPoly; } -// ----------------------------------------------------------------------- + basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygon& rPixelPolyPoly, const MapMode& rMapMode ) const @@ -1655,7 +1655,7 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygo return aTransformedPoly; } -// ----------------------------------------------------------------------- + Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& rMapMode ) const { @@ -1691,7 +1691,7 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r return aRegion; } -// ----------------------------------------------------------------------- + #define ENTER0( rSource, pMapModeSource, pMapModeDest ) \ if ( !pMapModeSource ) \ @@ -1701,7 +1701,7 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r if ( *pMapModeSource == *pMapModeDest ) \ return rSource -// ----------------------------------------------------------------------- + #define ENTER1( rSource, pMapModeSource, pMapModeDest ) \ ENTER0( rSource, pMapModeSource, pMapModeDest ); \ @@ -1734,7 +1734,7 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r else \ aMapResDest = maMapRes -// ----------------------------------------------------------------------- + #define ENTER2( eUnitSource, eUnitDest ) \ DBG_ASSERT( eUnitSource != MAP_SYSFONT \ @@ -1750,7 +1750,7 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r DBG_ASSERTWARNING( eUnitDest != MAP_PIXEL, \ "MAP_PIXEL mit 72dpi angenaehert" ) -// ----------------------------------------------------------------------- + #define ENTER3( eUnitSource, eUnitDest ) \ long nNumerator = 1; \ @@ -1769,7 +1769,7 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r else if( eUnitDest == MAP_PIXEL ) \ nNumerator *= 72 -// ----------------------------------------------------------------------- + #define ENTER4( rMapModeSource, rMapModeDest ) \ ImplMapRes aMapResSource; \ @@ -1784,7 +1784,7 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r ImplCalcMapResolution( rMapModeSource, 72, 72, aMapResSource ); \ ImplCalcMapResolution( rMapModeDest, 72, 72, aMapResDest ) -// ----------------------------------------------------------------------- + // return (n1 * n2 * n3) / (n4 * n5) static long fn5( const long n1, @@ -1904,7 +1904,7 @@ static long fn5( const long n1, } // of else } -// ----------------------------------------------------------------------- + // return (n1 * n2) / n3 static long fn3( const long n1, const long n2, const long n3 ) @@ -1941,7 +1941,7 @@ static long fn3( const long n1, const long n2, const long n3 ) } // of else } -// ----------------------------------------------------------------------- + Point OutputDevice::LogicToLogic( const Point& rPtSource, const MapMode* pMapModeSource, @@ -1959,7 +1959,7 @@ Point OutputDevice::LogicToLogic( const Point& rPtSource, aMapResDest.mnMapOfsY ); } -// ----------------------------------------------------------------------- + Size OutputDevice::LogicToLogic( const Size& rSzSource, const MapMode* pMapModeSource, @@ -1975,7 +1975,7 @@ Size OutputDevice::LogicToLogic( const Size& rSzSource, aMapResSource.mnMapScDenomY, aMapResDest.mnMapScNumY ) ); } -// ----------------------------------------------------------------------- + Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource, const MapMode* pMapModeSource, @@ -2001,7 +2001,7 @@ Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource, aMapResDest.mnMapOfsY ); } -// ----------------------------------------------------------------------- + Point OutputDevice::LogicToLogic( const Point& rPtSource, const MapMode& rMapModeSource, @@ -2037,7 +2037,7 @@ Point OutputDevice::LogicToLogic( const Point& rPtSource, } } -// ----------------------------------------------------------------------- + Size OutputDevice::LogicToLogic( const Size& rSzSource, const MapMode& rMapModeSource, @@ -2071,7 +2071,7 @@ Size OutputDevice::LogicToLogic( const Size& rSzSource, } } -// ----------------------------------------------------------------------- + basegfx::B2DPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolygon& rPolySource, const MapMode& rMapModeSource, @@ -2089,7 +2089,7 @@ basegfx::B2DPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolygon& rPoly return aPoly; } -// ----------------------------------------------------------------------- + basegfx::B2DPolyPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolyPolygon& rPolySource, const MapMode& rMapModeSource, @@ -2107,7 +2107,7 @@ basegfx::B2DPolyPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolyPolygo return aPoly; } -// ----------------------------------------------------------------------- + basegfx::B2DHomMatrix OutputDevice::LogicToLogic(const MapMode& rMapModeSource, const MapMode& rMapModeDest) { @@ -2148,7 +2148,7 @@ basegfx::B2DHomMatrix OutputDevice::LogicToLogic(const MapMode& rMapModeSource, return aTransform; } -// ----------------------------------------------------------------------- + Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource, const MapMode& rMapModeSource, @@ -2194,7 +2194,7 @@ Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource, } } -// ----------------------------------------------------------------------- + long OutputDevice::LogicToLogic( long nLongSource, MapUnit eUnitSource, MapUnit eUnitDest ) @@ -2208,7 +2208,7 @@ long OutputDevice::LogicToLogic( long nLongSource, return fn3( nLongSource, nNumerator, nDenominator ); } -// ----------------------------------------------------------------------- + void OutputDevice::SetPixelOffset( const Size& rOffset ) { @@ -2226,14 +2226,14 @@ void OutputDevice::SetPixelOffset( const Size& rOffset ) mpAlphaVDev->SetPixelOffset( rOffset ); } -// ----------------------------------------------------------------------- + Size OutputDevice::GetPixelOffset() const { return Size(mnOutOffOrigX, mnOutOffOrigY); } -// ----------------------------------------------------------------------- + long Window::ImplLogicUnitToPixelX( long nX, MapUnit eUnit ) { @@ -2260,7 +2260,7 @@ long Window::ImplLogicUnitToPixelX( long nX, MapUnit eUnit ) return nX; } -// ----------------------------------------------------------------------- + long Window::ImplLogicUnitToPixelY( long nY, MapUnit eUnit ) { diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index ccf7771b99ee..36b5c69c0ebe 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -4401,10 +4401,10 @@ we check in the following sequence: considered the named destination in the target file, set relative or absolute as requested else strip the fragment from URL and then set URI or 'launch application' as requested */ -// + // FIXME: check if the decode mechanisms for URL processing throughout this implementation // are the correct one!! -// + // extract target file type INetURLObject aDocumentURL( m_aContext.BaseURL ); INetURLObject aTargetURL( rLink.m_aURL ); @@ -4503,7 +4503,7 @@ we check in the following sequence: // protocol then force the uri action on it // This code will permit the correct opening of application on web pages, // the one that normally have fragments (but I may be wrong...) - // and will force the use of URI when the protocol is not file:// + // and will force the use of URI when the protocol is not file: if( (!aFragment.isEmpty() && !bTargetHasPDFExtension) || eTargetProtocol != INET_PROT_FILE ) { diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index 61329f0a98b2..d6eb73f59274 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -84,7 +84,7 @@ private: sal_uInt8* mpScanPrior; // pointer to the latest scanline sal_uInt8* mpTransTab; // for transparency in images with palette colortype sal_uInt8* mpScanCurrent; // pointer into the current scanline - sal_uInt8* mpColorTable; // + sal_uInt8* mpColorTable; sal_Size mnStreamSize; // estimate of PNG file size sal_uInt32 mnChunkType; // Type of current PNG chunk sal_Int32 mnChunkLen; // Length of current PNG chunk diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index b6b8f23de2b8..098deabe588e 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -712,12 +712,12 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, // the number of metafile actions, and it finds all distinct // regions of rectangle-bounded connected components. This // algorithm was designed by AF. - // - // + + // STAGE 1: Detect background - // ========================== - // + + // Receives uniform background content, and is _not_ merged // nor checked for intersection against other aCCList elements @@ -860,10 +860,10 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, ++nActionNum; } - // + // STAGE 2: Generate connected components list - // =========================================== - // + + // iterate over all actions (start where background action // search left off) @@ -888,10 +888,10 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, bool bTreatSpecial( false ); ConnectedComponents aTotalComponents; - // + // STAGE 2.1: Search for intersecting cc entries - // ============================================= - // + + // if aBBCurrAct is empty, it will intersect with no // aCCList member. Thus, we can save the check. @@ -983,10 +983,10 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, while( bSomeComponentsChanged ); } - // + // STAGE 2.2: Determine special state for cc element - // ================================================= - // + + // now test whether the whole connected component must be // treated specially (i.e. rendered as a bitmap): if the @@ -1054,10 +1054,10 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, } - // + // STAGE 2.3: Add newly generated CC list element - // ============================================== - // + + // set new bounds and add action to list aTotalComponents.aBounds = aTotalBounds; @@ -1104,10 +1104,10 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, } } - // + // STAGE 3.1: Output background mtf actions (if there are any) - // =========================================================== - // + + ComponentList::iterator aCurrAct( aBackgroundComponent.aComponentList.begin() ); const ComponentList::iterator aLastAct( aBackgroundComponent.aComponentList.end() ); @@ -1119,10 +1119,10 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, } - // + // STAGE 3.2: Generate banded bitmaps for special regions - // ==================================================== - // + + Point aPageOffset; Size aTmpSize( GetOutputSizePixel() ); @@ -1296,10 +1296,10 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, while( nCount-- ) aMapModeVDev.Pop(); - // + // STAGE 4: Copy actions to output metafile - // ======================================== - // + + // iterate over all actions and duplicate the ones not in a // special aCCList member into rOutMtf diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index a64e6fc3ddff..7ce25b7ccbda 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -907,7 +907,7 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons } //fdo#61886 -// + //when printing is finished, set the paper size of the printer to either what //the user explicitly set as the desired paper size, or fallback to whatever //the printer had before printing started. That way it doesn't contain the last diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx index f7e0820f9c17..59d9c914799e 100644 --- a/vcl/source/gdi/regband.cxx +++ b/vcl/source/gdi/regband.cxx @@ -25,23 +25,23 @@ #include "regband.hxx" -// ======================================================================= -// + + // ImplRegionBand -// + // Each band contains all rectangles between upper and lower border. // For Union, Intersect, Xor and Exclude operations rectangles of // equal height are evaluated. The borders of the bands should always // be choosen such that this is possible. -// + // If possible, rectangles within the bands are condensed. -// + // When converting polygons all points of the polygon are registered // in the individual bands (for each band they are stored as // points in a list). After registration of these points they are // converted to rectangles and the points in the list are deleted. -// -// + + ImplRegionBand::ImplRegionBand( long nTop, long nBottom ) @@ -146,7 +146,7 @@ ImplRegionBand::~ImplRegionBand() } -// + // generate separations from lines and process union with existing // separations @@ -199,7 +199,7 @@ void ImplRegionBand::ProcessPoints() } -// + // generate separations from lines and process union with existing // separations @@ -339,7 +339,7 @@ void ImplRegionBand::ScaleX( double fHorzScale ) } -// + // combine overlaping sparations bool ImplRegionBand::OptimizeBand() @@ -591,50 +591,50 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight ) DBG_ASSERT( nXLeft <= nXRight, "ImplRegionBand::XOr(): nxLeft > nXRight" ); // #i46602# Reworked rectangle Xor - // + // In general, we can distinguish 11 cases of intersection // (details below). The old implementation explicitly handled 7 // cases (numbered in the order of appearance, use CVS to get your // hands on the old version), therefore, I've sticked to that // order, and added four more cases. The code below references // those numbers via #1, #2, etc. - // + // Num Mnem newX:oldX newY:oldY Description Result Can quit? - // + // #1 Empty band - - The band is empty, thus, simply add new bandSep just add Yes - // + // #2 apart - - The rectangles are disjunct, add new one as is just add Yes - // + // #3 atop == == The rectangles are _exactly_ the same, remove existing just remove Yes - // + // #4 around < > The new rectangle extends the old to both sides intersect No - // + // #5 left < < The new rectangle is left of the old (but intersects) intersect Yes - // + // #5b left-atop < == The new is left of the old, and coincides on the right intersect Yes - // + // #6 right > > The new is right of the old (but intersects) intersect No - // + // #6b right-atop == > The new is right of the old, and coincides on the left intersect No - // + // #7 inside > < The new is fully inside the old intersect Yes - // + // #8 inside-right > == The new is fully inside the old, coincides on the right intersect Yes - // + // #9 inside-left == < The new is fully inside the old, coincides on the left intersect Yes - // - // + + // Then, to correctly perform XOr, the segment that's switched off // (i.e. the overlapping part of the old and the new segment) must // be extended by one pixel value at each border: // 1 1 // 0 4 0 4 // 111100000001111 - // + // Clearly, the leading band sep now goes from 0 to 3, and the // trailing band sep from 11 to 14. This mimicks the xor look of a // bitmap operation. - // + // band empty? -> add element if ( !mpFirstSep ) @@ -737,7 +737,7 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight ) "ImplRegionBand::XOr(): Case 4,5,6,7 expected all coordinates to be not equal!" ); // The plain-jane check would look like this: - // + // if( nXLeft < nOldLeft ) // { // // #4,5 @@ -762,7 +762,7 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight ) // // #7 done! // } // } - // + // but since we generally don't have to care whether // it's 4 or 6 (only that we must not stop processing // here), condensed that in such a way that only the diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index 8c536275a5ed..ff8314c61d57 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -32,10 +32,10 @@ #include <basegfx/range/b2drange.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// + + namespace { @@ -226,7 +226,7 @@ namespace } } // end of anonymous namespace -////////////////////////////////////////////////////////////////////////////// + bool Region::IsEmpty() const { diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx index 13106ac7e1ac..b74a780cff67 100644 --- a/vcl/source/gdi/regionband.cxx +++ b/vcl/source/gdi/regionband.cxx @@ -21,10 +21,10 @@ #include <tools/debug.hxx> #include <regionband.hxx> -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// + + RegionBand::RegionBand() : mpFirstBand(0), diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx index 35f66b58924a..feb6e59ca390 100644 --- a/vcl/source/gdi/salgdilayout.cxx +++ b/vcl/source/gdi/salgdilayout.cxx @@ -45,9 +45,9 @@ #include "basegfx/polygon/b2dpolygon.hxx" -// ---------------------------------------------------------------------------- + // The only common SalFrame method -// ---------------------------------------------------------------------------- + SalFrameGeometry SalFrame::GetGeometry() { @@ -64,7 +64,7 @@ SalFrameGeometry SalFrame::GetGeometry() return maGeometry; } -// ---------------------------------------------------------------------------- + SalGraphics::SalGraphics() : m_nLayout( 0 ), @@ -79,7 +79,7 @@ SalGraphics::~SalGraphics() { } -// ---------------------------------------------------------------------------- + bool SalGraphics::drawTransformedBitmap( const basegfx::B2DPoint& /* rNull */, @@ -92,7 +92,7 @@ bool SalGraphics::drawTransformedBitmap( return false; } -// ---------------------------------------------------------------------------- + void SalGraphics::mirror( long& x, const OutputDevice *pOutDev, bool bBack ) const { @@ -270,7 +270,7 @@ void SalGraphics::mirror( Region& rRgn, const OutputDevice *pOutDev, bool bBack //bool bRegionRect; //Region aMirroredRegion; //long nX, nY, nWidth, nHeight; - // + //bRegionRect = rRgn.ImplGetFirstRect( aInfo, nX, nY, nWidth, nHeight ); //while ( bRegionRect ) //{ @@ -376,7 +376,7 @@ basegfx::B2DPolyPolygon SalGraphics::mirror( const basegfx::B2DPolyPolygon& i_rP return aRet; } -// ---------------------------------------------------------------------------- + bool SalGraphics::SetClipRegion( const Region& i_rClip, const OutputDevice *pOutDev ) { diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index c2bb8b7422b7..f22568e87479 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -70,7 +70,7 @@ FILE * mslLog() #endif } #endif -// ======================================================================= + std::ostream &operator <<(std::ostream& s, ImplLayoutArgs &rArgs) { @@ -185,7 +185,7 @@ bool IsDiacritic( sal_UCS4 nChar ) return false; } -// ======================================================================= + int GetVerticalFlags( sal_UCS4 nChar ) { @@ -347,7 +347,7 @@ inline bool IsControlChar( sal_UCS4 cChar ) return false; } -// ======================================================================= + bool ImplLayoutRuns::AddPos( int nCharPos, bool bRTL ) { @@ -510,7 +510,7 @@ bool ImplLayoutRuns::GetRun( int* nMinRunPos, int* nEndRunPos, bool* bRightToLef return true; } -// ======================================================================= + ImplLayoutArgs::ImplLayoutArgs( const sal_Unicode* pStr, int nLen, int nMinCharPos, int nEndCharPos, int nFlags, const LanguageTag& rLanguageTag ) @@ -674,7 +674,7 @@ bool ImplLayoutArgs::GetNextRun( int* nMinRunPos, int* nEndRunPos, bool* bRTL ) return bValid; } -// ======================================================================= + SalLayout::SalLayout() : mnMinCharPos( -1 ), @@ -872,7 +872,7 @@ bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph ) const return bRet; } -// ======================================================================= + GenericSalLayout::GenericSalLayout() {} @@ -1024,7 +1024,7 @@ void GenericSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) // to get an array that maps input characters (not glyphs) to their absolute // position, GetTextArray() in turn calls SalLayout::FillDXArray() to get an // array of character widths that it converts to absolute positions. -// + // Writer would then apply justification adjustments to that array of absolute // character positions and return to OutputDevice, which eventually calls // ApplyDXArray(), which needs to extract the individual adjustments for each @@ -1034,7 +1034,7 @@ void GenericSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) // text layout bugs, and instead of fixing the broken design a hack after hack // have been applied on top of it, making it a complete mess that nobody // understands. -// + // As you can see by now, this is utterly stupid, why Writer does not just send // us directly the advance width transformations it wants to apply to each // character instead of this whole mess? @@ -1557,7 +1557,7 @@ void GenericSalLayout::SortGlyphItems() } } -// ======================================================================= + MultiSalLayout::MultiSalLayout( SalLayout& rBaseLayout, const PhysicalFontFace* pBaseFont ) : SalLayout() diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx index 5786480c0296..fa3ebdf1e1d5 100644 --- a/vcl/source/gdi/svgdata.cxx +++ b/vcl/source/gdi/svgdata.cxx @@ -29,11 +29,11 @@ #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace ::com::sun::star; -////////////////////////////////////////////////////////////////////////////// + BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( const Primitive2DSequence& rSequence, @@ -91,7 +91,7 @@ BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( return aRetval; } -////////////////////////////////////////////////////////////////////////////// + void SvgData::ensureReplacement() { @@ -103,7 +103,7 @@ void SvgData::ensureReplacement() } } -////////////////////////////////////////////////////////////////////////////// + void SvgData::ensureSequenceAndRange() { @@ -160,7 +160,7 @@ void SvgData::ensureSequenceAndRange() } } -////////////////////////////////////////////////////////////////////////////// + SvgData::SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLength, const OUString& rPath) : maSvgDataArray(rSvgDataArray), @@ -172,7 +172,7 @@ SvgData::SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLeng { } -////////////////////////////////////////////////////////////////////////////// + SvgData::SvgData(const OUString& rPath): maSvgDataArray(), mnSvgDataArrayLength(0), @@ -200,7 +200,7 @@ SvgData::SvgData(const OUString& rPath): } } -////////////////////////////////////////////////////////////////////////////// + const basegfx::B2DRange& SvgData::getRange() const { @@ -209,7 +209,7 @@ const basegfx::B2DRange& SvgData::getRange() const return maRange; } -////////////////////////////////////////////////////////////////////////////// + const Primitive2DSequence& SvgData::getPrimitive2DSequence() const { @@ -218,7 +218,7 @@ const Primitive2DSequence& SvgData::getPrimitive2DSequence() const return maSequence; } -////////////////////////////////////////////////////////////////////////////// + const BitmapEx& SvgData::getReplacement() const { diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index 2d774a58b7f9..e0b497311f21 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star::uno; -// ======================================================================= + void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev, long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData ) |