diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-04-02 16:45:44 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-04-02 16:54:18 +0300 |
commit | 50bf123ddbeb457b89636621a99c971834adf3ab (patch) | |
tree | b7782261998ca0b6bece98543e2c66e3c96f4d3c /vcl/source/gdi | |
parent | db1c9e4dadc90c5afe3190776a60cc5dcbbce3ac (diff) |
Kill superfluous vertical whitespace
Change-Id: I81ce8fd7022bf283db668705efdfb0666f87bde9
Diffstat (limited to 'vcl/source/gdi')
60 files changed, 0 insertions, 1804 deletions
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index abc068958353..6236b0c55f53 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/animate.hxx> #include <tools/debug.hxx> #include <tools/stream.hxx> @@ -27,7 +26,6 @@ #include <impanmvw.hxx> #include <vcl/dibtools.hxx> - #define MIN_TIMEOUT 2L #define INC_TIMEOUT 0L @@ -301,7 +299,6 @@ void Animation::Stop( OutputDevice* pOut, long nExtraData ) for( size_t i = 0; i < maViewList.size(); ) { - ImplAnimView* pView = maViewList[ i ]; if( pView->ImplMatches( pOut, nExtraData ) ) { diff --git a/vcl/source/gdi/base14.cxx b/vcl/source/gdi/base14.cxx index 52e99a5e262b..1e3dda522817 100644 --- a/vcl/source/gdi/base14.cxx +++ b/vcl/source/gdi/base14.cxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "pdfwriter_impl.hxx" #include <rtl/strbuf.hxx> #include <vcl/settings.hxx> using namespace vcl; - OString PDFWriterImpl::BuiltinFont::getNameObject() const { OStringBuffer aBuf( 16 ); diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index eed59885bca0..51221ee5873f 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -946,8 +946,6 @@ bool Bitmap::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nSc return bRetval; } - - bool Bitmap::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag ) { const Size aSize( GetSizePixel() ); @@ -965,15 +963,11 @@ bool Bitmap::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag ) return bRet; } - - void Bitmap::AdaptBitCount(Bitmap& rNew) const { ImplAdaptBitCount(rNew); } - - void Bitmap::ImplAdaptBitCount(Bitmap& rNew) const { // aNew is the result of some operation; adapt it's BitCount to the original (this) @@ -2076,8 +2070,6 @@ bool Bitmap::ImplScaleSuper( return bRet; } - - namespace { void ImplCalculateContributions( @@ -2434,8 +2426,6 @@ bool Bitmap::ImplScaleConvolution( return bResult; } - - bool Bitmap::Dither( sal_uLong nDitherFlags ) { bool bRet = false; diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx index 642d2010342e..f8c987edb0fc 100644 --- a/vcl/source/gdi/bitmap4.cxx +++ b/vcl/source/gdi/bitmap4.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdlib.h> #include <vcl/bmpacc.hxx> #include <vcl/bitmap.hxx> @@ -1175,7 +1174,6 @@ bool Bitmap::ImplSeparableUnsharpenFilter(const double radius) { return true; } - bool Bitmap::ImplDuotoneFilter( const sal_uLong nColorOne, const sal_uLong nColorTwo ) { const long nWidth = GetSizePixel().Width(); diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 8eb46131c23f..0e41be103957 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -323,8 +323,6 @@ sal_uLong BitmapEx::GetChecksum() const return nCrc; } - - void BitmapEx::SetSizePixel( const Size& rNewSize, sal_uInt32 nScaleFlag ) { if(GetSizePixel() != rNewSize) @@ -363,8 +361,6 @@ bool BitmapEx::Mirror( sal_uLong nMirrorFlags ) return bRet; } - - bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) { bool bRet = false; @@ -387,8 +383,6 @@ bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 n return bRet; } - - bool BitmapEx::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag ) { bool bRet; @@ -828,8 +822,6 @@ bool BitmapEx::Create( const ::com::sun::star::uno::Reference< return false; } - - namespace { Bitmap impTransformBitmap( @@ -921,8 +913,6 @@ BitmapEx BitmapEx::TransformBitmapEx( return BitmapEx(aDestination); } - - BitmapEx BitmapEx::getTransformed( const basegfx::B2DHomMatrix& rTransformation, const basegfx::B2DRange& rVisibleRange, @@ -1005,8 +995,6 @@ BitmapEx BitmapEx::getTransformed( return aRetval; } - - BitmapEx BitmapEx::ModifyBitmapEx(const basegfx::BColorModifierStack& rBColorModifierStack) const { Bitmap aChangedBitmap(GetBitmap()); @@ -1160,8 +1148,6 @@ BitmapEx BitmapEx::ModifyBitmapEx(const basegfx::BColorModifierStack& rBColorMod } } - - BitmapEx VCL_DLLPUBLIC createBlendFrame( const Size& rSize, sal_uInt8 nAlpha, diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx index 92160da2b990..134764b242f1 100644 --- a/vcl/source/gdi/bmpacc.cxx +++ b/vcl/source/gdi/bmpacc.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/salbtype.hxx> #include <vcl/bitmap.hxx> #include <vcl/bmpacc.hxx> @@ -414,7 +413,6 @@ void BitmapWriteAccess::CopyScanline( long nY, const BitmapReadAccess& rReadAcc SetPixel( nY, nX, rReadAcc.GetPixel( nY, nX ) ); } - void BitmapWriteAccess::CopyScanline( long nY, ConstScanline aSrcScanline, sal_uLong nSrcScanlineFormat, sal_uLong nSrcScanlineSize ) { diff --git a/vcl/source/gdi/bmpacc3.cxx b/vcl/source/gdi/bmpacc3.cxx index 791a75d9329d..65658d07a7eb 100644 --- a/vcl/source/gdi/bmpacc3.cxx +++ b/vcl/source/gdi/bmpacc3.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/poly.hxx> #include <vcl/salbtype.hxx> diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx index 949e21af0c16..3c668b02c445 100644 --- a/vcl/source/gdi/bmpfast.cxx +++ b/vcl/source/gdi/bmpfast.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <bmpfast.hxx> #include <tools/debug.hxx> #include <vcl/bmpacc.hxx> diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx index 796036224427..72b11592029d 100644 --- a/vcl/source/gdi/configsettings.cxx +++ b/vcl/source/gdi/configsettings.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/configsettings.hxx> #include <svdata.hxx> @@ -33,7 +32,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::container; - #define SETTINGS_CONFIGNODE "VCL/Settings" SettingsConfigItem* SettingsConfigItem::get() diff --git a/vcl/source/gdi/cvtgrf.cxx b/vcl/source/gdi/cvtgrf.cxx index 02ca28869cd1..65cc9193292b 100644 --- a/vcl/source/gdi/cvtgrf.cxx +++ b/vcl/source/gdi/cvtgrf.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/metaact.hxx> #include <vcl/cvtgrf.hxx> diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 5d71a46ffe7f..d6f1e4d297f4 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -32,7 +32,6 @@ #define DIBINFOHEADERSIZE ( sizeof(DIBInfoHeader) ) #define DIBV5HEADERSIZE ( sizeof(DIBV5Header) ) - // - Compression defines #define COMPRESS_OWN ('S'|('D'<<8UL)) @@ -42,7 +41,6 @@ #define BITFIELDS ( 3UL ) #define ZCOMPRESS ( COMPRESS_OWN | 0x01000000UL ) /* == 'SD01' (binary) */ - // - DIBInfoHeader and DIBV5Header typedef sal_Int32 FXPT2DOT30; @@ -148,8 +146,6 @@ struct DIBV5Header : public DIBInfoHeader {} }; - - namespace { inline sal_uInt16 discretizeBitcount( sal_uInt16 nInputCount ) @@ -165,8 +161,6 @@ namespace } } - - bool ImplReadDIBInfoHeader(SvStream& rIStm, DIBV5Header& rHeader, bool& bTopDown) { // BITMAPINFOHEADER or BITMAPCOREHEADER or BITMAPV5HEADER @@ -1329,8 +1323,6 @@ bool ImplWriteDIBFileHeader(SvStream& rOStm, BitmapReadAccess& rAcc, bool bUseDI return( rOStm.GetError() == 0UL ); } - - bool ImplReadDIB( Bitmap& rTarget, Bitmap* pTargetAlpha, @@ -1438,8 +1430,6 @@ bool ImplWriteDIB( return bRet; } - - bool ReadDIB( Bitmap& rTarget, SvStream& rIStm, @@ -1536,8 +1526,6 @@ bool ReadDIBV5( return ImplReadDIB(rTarget, &rTargetAlpha, rIStm, true); } - - bool WriteDIB( const Bitmap& rSource, SvStream& rOStm, diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index b20286959b9c..489304e7cb9a 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "unotools/fontcfg.hxx" #include "tools/stream.hxx" @@ -37,7 +36,6 @@ using namespace vcl; - Impl_Font::Impl_Font() : maColor( COL_TRANSPARENT ), maFillColor( COL_TRANSPARENT ), @@ -614,7 +612,6 @@ void Font::Merge( const Font& rFont ) if ( rFont.mpImplFont->meWidthType != WIDTH_DONTKNOW ) SetWidthType( rFont.GetWidthType() ); - if ( rFont.GetSize().Height() ) SetSize( rFont.GetSize() ); if ( rFont.GetUnderline() != UNDERLINE_DONTKNOW ) diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx index e090a7d6f503..04d52cb036c8 100644 --- a/vcl/source/gdi/gdimetafiletools.cxx +++ b/vcl/source/gdi/gdimetafiletools.cxx @@ -27,7 +27,6 @@ #include <vcl/svapp.hxx> #include <vcl/graphictools.hxx> - // helpers namespace @@ -256,7 +255,6 @@ namespace } } // end of anonymous namespace - // #i121267# Tooling to internally clip geometry against internal clip regions void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) @@ -480,7 +478,6 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) break; } - // geometry actions case META_LINE_ACTION : @@ -706,7 +703,6 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) break; } - // bitmap actions, create BitmapEx with alpha channel derived // from clipping @@ -858,7 +854,6 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) break; } - // need to handle all those 'hacks' which hide data in comments case META_COMMENT_ACTION : @@ -964,10 +959,8 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) break; } - // need to handle gradient fills (hopefully only unroated ones) - case META_GRADIENT_ACTION : { const MetaGradientAction* pA = static_cast< const MetaGradientAction* >(pAction); @@ -990,7 +983,6 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) aTarget); } - break; } @@ -1065,8 +1057,6 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) } } - - bool VCL_DLLPUBLIC usesClipActions(const GDIMetaFile& rSource) { const sal_uLong nObjCount(rSource.GetActionSize()); diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 5698066e8ce2..797f14a9ef9b 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -2765,7 +2765,6 @@ SvStream& ReadGDIMetaFile( SvStream& rIStm, GDIMetaFile& rGDIMetaFile ) { pAction = MetaAction::ReadMetaAction( rIStm, &aReadData ); - if( pAction ) { if (pAction->GetType() == META_COMMENT_ACTION) diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index 3d6ba2951f19..2a6f8c88f2c4 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <osl/file.h> #include <tools/vcompat.hxx> #include <tools/debug.hxx> diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx index d8eed8320a27..6b40529d8506 100644 --- a/vcl/source/gdi/gradient.cxx +++ b/vcl/source/gdi/gradient.cxx @@ -23,7 +23,6 @@ #include <tools/gen.hxx> #include <vcl/gradient.hxx> - Impl_Gradient::Impl_Gradient() : maStartColor( COL_BLACK ), maEndColor( COL_WHITE ) diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index 447ad966b948..7c913abc1d32 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -121,7 +121,6 @@ void SvtGraphicStroke::setEndArrow( const PolyPolygon& rPoly ) maEndArrow = rPoly; } - void SvtGraphicStroke::scale( double fXScale, double fYScale ) { // Clearly scaling stroke-width for fat lines is rather a problem diff --git a/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx index e4d08e08a7f3..c1d0551accf9 100644 --- a/vcl/source/gdi/hatch.cxx +++ b/vcl/source/gdi/hatch.cxx @@ -22,7 +22,6 @@ #include <tools/debug.hxx> #include <vcl/hatch.hxx> - ImplHatch::ImplHatch() : mnRefCount ( 1 ), maColor ( COL_BLACK ), diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index 77dd01ee1fdb..163e8ef0e991 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -20,7 +20,6 @@ #include <boost/scoped_ptr.hpp> #include <boost/scoped_array.hpp> - #include <osl/file.hxx> #include <tools/debug.hxx> #include <tools/stream.hxx> @@ -41,7 +40,6 @@ #include <rtl/strbuf.hxx> #endif - using namespace ::com::sun::star; Image::Image() : @@ -293,7 +291,6 @@ ImageList::ImageList( const ResId& rResId ) : { SAL_INFO( "vcl.gdi", "vcl: ImageList::ImageList( const ResId& rResId )" ); - rResId.SetRT( RSC_IMAGELIST ); ResMgr* pResMgr = rResId.GetResMgr(); @@ -342,7 +339,6 @@ ImageList::ImageList( const ::std::vector< OUString >& rNameVector, { SAL_INFO( "vcl.gdi", "vcl: ImageList::ImageList(const vector< OUString >& ..." ); - ImplInit( sal::static_int_cast< sal_uInt16 >( rNameVector.size() ), Size() ); mpImplData->maPrefix = rPrefix; @@ -642,7 +638,6 @@ void ImageList::GetImageNames( ::std::vector< OUString >& rNames ) const { SAL_INFO( "vcl.gdi", "vcl: ImageList::GetImageNames" ); - rNames = ::std::vector< OUString >(); if( mpImplData ) diff --git a/vcl/source/gdi/imagerepository.cxx b/vcl/source/gdi/imagerepository.cxx index f83981ecd22e..66398d972328 100644 --- a/vcl/source/gdi/imagerepository.cxx +++ b/vcl/source/gdi/imagerepository.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/bitmapex.hxx> #include <vcl/imagerepository.hxx> #include <vcl/settings.hxx> diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx index ee34d1fdeefd..394bdd2d0a88 100644 --- a/vcl/source/gdi/impanmvw.cxx +++ b/vcl/source/gdi/impanmvw.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "impanmvw.hxx" #include <vcl/virdev.hxx> #include <vcl/window.hxx> diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx index 08ecc18b7a91..005a45e6e9aa 100644 --- a/vcl/source/gdi/impbmp.cxx +++ b/vcl/source/gdi/impbmp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/bitmap.hxx> #include <svdata.hxx> diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx index e341c813b4a9..31d796855733 100644 --- a/vcl/source/gdi/impfont.cxx +++ b/vcl/source/gdi/impfont.cxx @@ -22,8 +22,6 @@ #include <vector> #include <set> - - CmapResult::CmapResult( bool bSymbolic, const sal_UCS4* pRangeCodes, int nRangeCount, const int* pStartGlyphs, const sal_uInt16* pExtraGlyphIds ) @@ -35,8 +33,6 @@ CmapResult::CmapResult( bool bSymbolic, , mbRecoded( false) {} - - ImplFontCharMap::ImplFontCharMap( const CmapResult& rCR ) : mpRangeCodes( rCR.mpRangeCodes ) , mpStartGlyphs( rCR.mpStartGlyphs ) @@ -58,16 +54,12 @@ 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 { const bool bIsDefault = (mpRangeCodes == aDefaultUnicodeRanges) || (mpRangeCodes == aDefaultSymbolRanges); return bIsDefault; } - - ImplFontCharMap::~ImplFontCharMap() { if( IsDefaultMap() ) @@ -77,8 +69,6 @@ ImplFontCharMap::~ImplFontCharMap() delete[] mpGlyphIds; } - - ImplFontCharMap* ImplFontCharMap::GetDefaultMap( bool bSymbols) { if( pDefaultImplFontCharMap ) @@ -100,15 +90,11 @@ ImplFontCharMap* ImplFontCharMap::GetDefaultMap( bool bSymbols) return pDefaultImplFontCharMap; } - - void ImplFontCharMap::AddReference( void) const { ++mnRefCount; } - - void ImplFontCharMap::DeReference( void) const { if( --mnRefCount <= 0 ) @@ -116,15 +102,11 @@ void ImplFontCharMap::DeReference( void) const delete this; } - - int ImplFontCharMap::GetCharCount() const { return mnCharCount; } - - int ImplFontCharMap::ImplFindRangeIndex( sal_UCS4 cChar ) const { int nLower = 0; @@ -142,8 +124,6 @@ int ImplFontCharMap::ImplFindRangeIndex( sal_UCS4 cChar ) const return nMid; } - - bool ImplFontCharMap::HasChar( sal_UCS4 cChar ) const { bool bHasChar = false; @@ -161,8 +141,6 @@ bool ImplFontCharMap::HasChar( sal_UCS4 cChar ) const return bHasChar; } - - int ImplFontCharMap::GetGlyphIndex( sal_UCS4 cChar ) const { // return -1 if the object doesn't know the glyph ids @@ -198,8 +176,6 @@ 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) int ImplFontCharMap::CountCharsInRange( sal_UCS4 cMin, sal_UCS4 cMax ) const @@ -227,22 +203,16 @@ 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 { if( cChar < GetFirstChar() ) @@ -256,8 +226,6 @@ sal_UCS4 ImplFontCharMap::GetNextChar( sal_UCS4 cChar ) const return (cChar + 1); } - - sal_UCS4 ImplFontCharMap::GetPrevChar( sal_UCS4 cChar ) const { if( cChar <= GetFirstChar() ) @@ -271,8 +239,6 @@ sal_UCS4 ImplFontCharMap::GetPrevChar( sal_UCS4 cChar ) const return (cChar - 1); } - - int ImplFontCharMap::GetIndexFromChar( sal_UCS4 cChar ) const { // TODO: improve linear walk? @@ -293,8 +259,6 @@ int ImplFontCharMap::GetIndexFromChar( sal_UCS4 cChar ) const return -1; } - - sal_UCS4 ImplFontCharMap::GetCharFromIndex( int nCharIndex ) const { // TODO: improve linear walk? @@ -312,8 +276,6 @@ 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]);} static int GetSShort( const unsigned char* p ){ return((static_cast<signed char>(p[0])<<8)|p[1]);} @@ -602,36 +564,26 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult ) return true; } - - FontCharMap::FontCharMap() : mpImpl( ImplFontCharMap::GetDefaultMap() ) {} - - FontCharMap::~FontCharMap() { mpImpl->DeReference(); 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 ) { if( pNewMap == NULL ) @@ -647,57 +599,41 @@ 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 // during font enumeration. macStyle bits would be not sufficient anyway @@ -848,6 +784,4 @@ void UpdateAttributesFromPSName( const OUString& rPSName, ImplDevFontAttributes& } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx index 9f1333ff4080..0e1fd7e6a4fc 100644 --- a/vcl/source/gdi/impimage.cxx +++ b/vcl/source/gdi/impimage.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/outdev.hxx> #include <vcl/bitmapex.hxx> #include <vcl/alpha.hxx> diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index c996456675a2..9ba36dfea7b9 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -145,7 +145,6 @@ bool ImplImageTree::loadDefaultImage( style, bitmap, false); } - bool ImplImageTree::doLoadImage( OUString const & name, OUString const & style, BitmapEx & bitmap, bool localized) diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index 317c6c90e7e5..87a15e422048 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdlib.h> #include <vcl/bmpacc.hxx> #include <tools/poly.hxx> diff --git a/vcl/source/gdi/impvect.hxx b/vcl/source/gdi/impvect.hxx index e0d8d4d1a9ef..f903dcdd44c0 100644 --- a/vcl/source/gdi/impvect.hxx +++ b/vcl/source/gdi/impvect.hxx @@ -23,10 +23,8 @@ #include <tools/poly.hxx> #include <vcl/gdimtf.hxx> - // - Vectorizer - - class BitmapReadAccess; class ImplChain; class ImplVectMap; diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 82354f1f14a7..ec1f44f6eb8b 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -26,7 +26,6 @@ #include <jobset.h> #include <boost/scoped_array.hpp> - #define JOBSET_FILE364_SYSTEM ((sal_uInt16)0xFFFF) #define JOBSET_FILE605_SYSTEM ((sal_uInt16)0xFFFE) diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx index 91c299177d63..a3c7fdb6bdd0 100644 --- a/vcl/source/gdi/lineinfo.cxx +++ b/vcl/source/gdi/lineinfo.cxx @@ -26,11 +26,8 @@ #include <basegfx/polygon/b2dlinegeometry.hxx> #include <numeric> - - // - ImplLineInfo - - ImplLineInfo::ImplLineInfo() : mnRefCount ( 1 ), meStyle ( LINE_SOLID ), @@ -45,8 +42,6 @@ ImplLineInfo::ImplLineInfo() : { } - - ImplLineInfo::ImplLineInfo( const ImplLineInfo& rImplLineInfo ) : mnRefCount ( 1 ), meStyle ( rImplLineInfo.meStyle ), @@ -61,8 +56,6 @@ ImplLineInfo::ImplLineInfo( const ImplLineInfo& rImplLineInfo ) : { } - - inline bool ImplLineInfo::operator==( const ImplLineInfo& rB ) const { return(meStyle == rB.meStyle @@ -76,10 +69,8 @@ inline bool ImplLineInfo::operator==( const ImplLineInfo& rB ) const && meLineCap == rB.meLineCap); } - // - LineInfo - - LineInfo::LineInfo( LineStyle eStyle, long nWidth ) { mpImplLineInfo = new ImplLineInfo; @@ -87,24 +78,18 @@ LineInfo::LineInfo( LineStyle eStyle, long nWidth ) mpImplLineInfo->mnWidth = nWidth; } - - LineInfo::LineInfo( const LineInfo& rLineInfo ) { mpImplLineInfo = rLineInfo.mpImplLineInfo; mpImplLineInfo->mnRefCount++; } - - LineInfo::~LineInfo() { if( !( --mpImplLineInfo->mnRefCount ) ) delete mpImplLineInfo; } - - LineInfo& LineInfo::operator=( const LineInfo& rLineInfo ) { @@ -117,8 +102,6 @@ LineInfo& LineInfo::operator=( const LineInfo& rLineInfo ) return *this; } - - bool LineInfo::operator==( const LineInfo& rLineInfo ) const { @@ -126,8 +109,6 @@ bool LineInfo::operator==( const LineInfo& rLineInfo ) const *mpImplLineInfo == *rLineInfo.mpImplLineInfo ); } - - void LineInfo::ImplMakeUnique() { if( mpImplLineInfo->mnRefCount != 1 ) @@ -139,64 +120,48 @@ void LineInfo::ImplMakeUnique() } } - - void LineInfo::SetStyle( LineStyle eStyle ) { ImplMakeUnique(); mpImplLineInfo->meStyle = eStyle; } - - void LineInfo::SetWidth( long nWidth ) { ImplMakeUnique(); mpImplLineInfo->mnWidth = nWidth; } - - void LineInfo::SetDashCount( sal_uInt16 nDashCount ) { ImplMakeUnique(); mpImplLineInfo->mnDashCount = nDashCount; } - - void LineInfo::SetDashLen( long nDashLen ) { ImplMakeUnique(); mpImplLineInfo->mnDashLen = nDashLen; } - - void LineInfo::SetDotCount( sal_uInt16 nDotCount ) { ImplMakeUnique(); mpImplLineInfo->mnDotCount = nDotCount; } - - void LineInfo::SetDotLen( long nDotLen ) { ImplMakeUnique(); mpImplLineInfo->mnDotLen = nDotLen; } - - void LineInfo::SetDistance( long nDistance ) { ImplMakeUnique(); mpImplLineInfo->mnDistance = nDistance; } - - void LineInfo::SetLineJoin(basegfx::B2DLineJoin eLineJoin) { @@ -207,8 +172,6 @@ void LineInfo::SetLineJoin(basegfx::B2DLineJoin eLineJoin) } } - - void LineInfo::SetLineCap(com::sun::star::drawing::LineCap eLineCap) { if(eLineCap != mpImplLineInfo->meLineCap) @@ -218,8 +181,6 @@ void LineInfo::SetLineCap(com::sun::star::drawing::LineCap eLineCap) } } - - bool LineInfo::IsDefault() const { return( !mpImplLineInfo->mnWidth @@ -227,8 +188,6 @@ bool LineInfo::IsDefault() const && ( com::sun::star::drawing::LineCap_BUTT == mpImplLineInfo->meLineCap)); } - - SvStream& ReadImplLineInfo( SvStream& rIStm, ImplLineInfo& rImplLineInfo ) { VersionCompat aCompat( rIStm, STREAM_READ ); @@ -266,8 +225,6 @@ SvStream& ReadImplLineInfo( SvStream& rIStm, ImplLineInfo& rImplLineInfo ) return rIStm; } - - SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo ) { VersionCompat aCompat( rOStm, STREAM_WRITE, 4 ); @@ -290,23 +247,17 @@ SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo return rOStm; } - - SvStream& ReadLineInfo( SvStream& rIStm, LineInfo& rLineInfo ) { rLineInfo.ImplMakeUnique(); return ReadImplLineInfo( rIStm, *rLineInfo.mpImplLineInfo ); } - - SvStream& WriteLineInfo( SvStream& rOStm, const LineInfo& rLineInfo ) { return WriteImplLineInfo( rOStm, *rLineInfo.mpImplLineInfo ); } - - void LineInfo::applyToB2DPolyPolygon( basegfx::B2DPolyPolygon& io_rLinePolyPolygon, basegfx::B2DPolyPolygon& o_rFillPolyPolygon) const diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx index 2a723a987e70..f48230a225a9 100644 --- a/vcl/source/gdi/mapmod.cxx +++ b/vcl/source/gdi/mapmod.cxx @@ -22,7 +22,6 @@ #include <tools/debug.hxx> #include <vcl/mapmod.hxx> - ImplMapMode::ImplMapMode() : maOrigin( 0, 0 ), maScaleX( 1, 1 ), diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index abd250d78748..e563a37168ac 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -30,16 +30,12 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <unotools/fontdefs.hxx> - - inline void ImplScalePoint( Point& rPt, double fScaleX, double fScaleY ) { rPt.X() = FRound( fScaleX * rPt.X() ); rPt.Y() = FRound( fScaleY * rPt.Y() ); } - - inline void ImplScaleRect( Rectangle& rRect, double fScaleX, double fScaleY ) { Point aTL( rRect.TopLeft() ); @@ -52,16 +48,12 @@ inline void ImplScaleRect( Rectangle& rRect, double fScaleX, double fScaleY ) rRect.Justify(); } - - inline void ImplScalePoly( Polygon& rPoly, double fScaleX, double fScaleY ) { for( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ ) ImplScalePoint( rPoly[ i ], fScaleX, fScaleY ); } - - inline void ImplScaleLineInfo( LineInfo& rLineInfo, double fScaleX, double fScaleY ) { if( !rLineInfo.IsDefault() ) @@ -75,83 +67,59 @@ 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 ), mnType( META_NULL_ACTION ) { } - - MetaAction::MetaAction( sal_uInt16 nType ) : mnRefCount( 1 ), mnType( nType ) { } - - MetaAction::~MetaAction() { } - - void MetaAction::Execute( OutputDevice* ) { } - - MetaAction* MetaAction::Clone() { return new MetaAction; } - - void MetaAction::Move( long, long ) { } - - void MetaAction::Scale( double, double ) { } - - bool MetaAction::Compare( const MetaAction& ) const { return true; } - - void MetaAction::Write( SvStream& rOStm, ImplMetaWriteData* ) { rOStm.WriteUInt16( mnType ); } - - void MetaAction::Read( SvStream&, ImplMetaReadData* ) { // DO NOT read mnType - ReadMetaAction already did that! } - - MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData ) { MetaAction* pAction = NULL; @@ -233,12 +201,8 @@ MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData return pAction; } - - IMPL_META_ACTION( Pixel, META_PIXEL_ACTION ) - - MetaPixelAction::MetaPixelAction( const Point& rPt, const Color& rColor ) : MetaAction ( META_PIXEL_ACTION ), maPt ( rPt ), @@ -246,15 +210,11 @@ MetaPixelAction::MetaPixelAction( const Point& rPt, const Color& rColor ) : { } - - void MetaPixelAction::Execute( OutputDevice* pOut ) { pOut->DrawPixel( maPt, maColor ); } - - MetaAction* MetaPixelAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPixelAction( *this ); @@ -262,30 +222,22 @@ MetaAction* MetaPixelAction::Clone() return pClone; } - - void MetaPixelAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaPixelAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } - - bool MetaPixelAction::Compare( const MetaAction& rMetaAction ) const { return ( maPt == ((MetaPixelAction&)rMetaAction).maPt ) && ( maColor == ((MetaPixelAction&)rMetaAction).maColor ); } - - void MetaPixelAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -293,8 +245,6 @@ void MetaPixelAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) maColor.Write( rOStm, true ); } - - void MetaPixelAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -302,27 +252,19 @@ void MetaPixelAction::Read( SvStream& rIStm, ImplMetaReadData* ) maColor.Read( rIStm, true ); } - - IMPL_META_ACTION( Point, META_POINT_ACTION ) - - MetaPointAction::MetaPointAction( const Point& rPt ) : MetaAction ( META_POINT_ACTION ), maPt ( rPt ) { } - - void MetaPointAction::Execute( OutputDevice* pOut ) { pOut->DrawPixel( maPt ); } - - MetaAction* MetaPointAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPointAction( *this ); @@ -330,49 +272,35 @@ MetaAction* MetaPointAction::Clone() return pClone; } - - void MetaPointAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaPointAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } - - bool MetaPointAction::Compare( const MetaAction& rMetaAction ) const { return maPt == ((MetaPointAction&)rMetaAction).maPt; } - - void MetaPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); WritePair( rOStm, maPt ); } - - void MetaPointAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadPair( rIStm, maPt ); } - - IMPL_META_ACTION( Line, META_LINE_ACTION ) - - MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd ) : MetaAction ( META_LINE_ACTION ), maStartPt ( rStart ), @@ -380,8 +308,6 @@ MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd ) : { } - - MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd, const LineInfo& rLineInfo ) : MetaAction ( META_LINE_ACTION ), @@ -391,8 +317,6 @@ MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd, { } - - void MetaLineAction::Execute( OutputDevice* pOut ) { if( maLineInfo.IsDefault() ) @@ -401,8 +325,6 @@ void MetaLineAction::Execute( OutputDevice* pOut ) pOut->DrawLine( maStartPt, maEndPt, maLineInfo ); } - - MetaAction* MetaLineAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaLineAction( *this ); @@ -410,16 +332,12 @@ MetaAction* MetaLineAction::Clone() return pClone; } - - void MetaLineAction::Move( long nHorzMove, long nVertMove ) { maStartPt.Move( nHorzMove, nVertMove ); maEndPt.Move( nHorzMove, nVertMove ); } - - void MetaLineAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maStartPt, fScaleX, fScaleY ); @@ -427,8 +345,6 @@ void MetaLineAction::Scale( double fScaleX, double fScaleY ) ImplScaleLineInfo( maLineInfo, fScaleX, fScaleY ); } - - bool MetaLineAction::Compare( const MetaAction& rMetaAction ) const { return ( maLineInfo == ((MetaLineAction&)rMetaAction).maLineInfo ) && @@ -436,8 +352,6 @@ bool MetaLineAction::Compare( const MetaAction& rMetaAction ) const ( maEndPt == ((MetaLineAction&)rMetaAction).maEndPt ); } - - void MetaLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); @@ -447,8 +361,6 @@ void MetaLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WriteLineInfo( rOStm, maLineInfo ); // Version 2 } - - void MetaLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -464,27 +376,19 @@ void MetaLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } - - IMPL_META_ACTION( Rect, META_RECT_ACTION ) - - MetaRectAction::MetaRectAction( const Rectangle& rRect ) : MetaAction ( META_RECT_ACTION ), maRect ( rRect ) { } - - void MetaRectAction::Execute( OutputDevice* pOut ) { pOut->DrawRect( maRect ); } - - MetaAction* MetaRectAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaRectAction( *this ); @@ -492,49 +396,35 @@ MetaAction* MetaRectAction::Clone() return pClone; } - - void MetaRectAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } - - void MetaRectAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } - - bool MetaRectAction::Compare( const MetaAction& rMetaAction ) const { return maRect == ((MetaRectAction&)rMetaAction).maRect; } - - void MetaRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); WriteRectangle( rOStm, maRect ); } - - void MetaRectAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadRectangle( rIStm, maRect ); } - - IMPL_META_ACTION( RoundRect, META_ROUNDRECT_ACTION ) - - MetaRoundRectAction::MetaRoundRectAction( const Rectangle& rRect, sal_uInt32 nHorzRound, sal_uInt32 nVertRound ) : MetaAction ( META_ROUNDRECT_ACTION ), @@ -544,15 +434,11 @@ MetaRoundRectAction::MetaRoundRectAction( const Rectangle& rRect, { } - - void MetaRoundRectAction::Execute( OutputDevice* pOut ) { pOut->DrawRect( maRect, mnHorzRound, mnVertRound ); } - - MetaAction* MetaRoundRectAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaRoundRectAction( *this ); @@ -560,15 +446,11 @@ MetaAction* MetaRoundRectAction::Clone() return pClone; } - - void MetaRoundRectAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } - - void MetaRoundRectAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); @@ -576,8 +458,6 @@ void MetaRoundRectAction::Scale( double fScaleX, double fScaleY ) mnVertRound = FRound( mnVertRound * fabs(fScaleY) ); } - - bool MetaRoundRectAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaRoundRectAction&)rMetaAction).maRect ) && @@ -585,8 +465,6 @@ bool MetaRoundRectAction::Compare( const MetaAction& rMetaAction ) const ( mnVertRound == ((MetaRoundRectAction&)rMetaAction).mnVertRound ); } - - void MetaRoundRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -594,35 +472,25 @@ void MetaRoundRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUInt32( mnHorzRound ).WriteUInt32( mnVertRound ); } - - void MetaRoundRectAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadRectangle( rIStm, maRect ).ReadUInt32( mnHorzRound ).ReadUInt32( mnVertRound ); } - - IMPL_META_ACTION( Ellipse, META_ELLIPSE_ACTION ) - - MetaEllipseAction::MetaEllipseAction( const Rectangle& rRect ) : MetaAction ( META_ELLIPSE_ACTION ), maRect ( rRect ) { } - - void MetaEllipseAction::Execute( OutputDevice* pOut ) { pOut->DrawEllipse( maRect ); } - - MetaAction* MetaEllipseAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaEllipseAction( *this ); @@ -630,49 +498,35 @@ MetaAction* MetaEllipseAction::Clone() return pClone; } - - void MetaEllipseAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } - - void MetaEllipseAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } - - bool MetaEllipseAction::Compare( const MetaAction& rMetaAction ) const { return maRect == ((MetaEllipseAction&)rMetaAction).maRect; } - - void MetaEllipseAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); WriteRectangle( rOStm, maRect ); } - - void MetaEllipseAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadRectangle( rIStm, maRect ); } - - IMPL_META_ACTION( Arc, META_ARC_ACTION ) - - MetaArcAction::MetaArcAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ) : MetaAction ( META_ARC_ACTION ), @@ -682,15 +536,11 @@ MetaArcAction::MetaArcAction( const Rectangle& rRect, { } - - void MetaArcAction::Execute( OutputDevice* pOut ) { pOut->DrawArc( maRect, maStartPt, maEndPt ); } - - MetaAction* MetaArcAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaArcAction( *this ); @@ -698,8 +548,6 @@ MetaAction* MetaArcAction::Clone() return pClone; } - - void MetaArcAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); @@ -707,8 +555,6 @@ void MetaArcAction::Move( long nHorzMove, long nVertMove ) maEndPt.Move( nHorzMove, nVertMove ); } - - void MetaArcAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); @@ -716,8 +562,6 @@ void MetaArcAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maEndPt, fScaleX, fScaleY ); } - - bool MetaArcAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaArcAction&)rMetaAction).maRect ) && @@ -725,8 +569,6 @@ bool MetaArcAction::Compare( const MetaAction& rMetaAction ) const ( maEndPt == ((MetaArcAction&)rMetaAction).maEndPt ); } - - void MetaArcAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -735,8 +577,6 @@ void MetaArcAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WritePair( rOStm, maEndPt ); } - - void MetaArcAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -745,12 +585,8 @@ void MetaArcAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maEndPt ); } - - IMPL_META_ACTION( Pie, META_PIE_ACTION ) - - MetaPieAction::MetaPieAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ) : MetaAction ( META_PIE_ACTION ), @@ -760,15 +596,11 @@ MetaPieAction::MetaPieAction( const Rectangle& rRect, { } - - void MetaPieAction::Execute( OutputDevice* pOut ) { pOut->DrawPie( maRect, maStartPt, maEndPt ); } - - MetaAction* MetaPieAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPieAction( *this ); @@ -776,8 +608,6 @@ MetaAction* MetaPieAction::Clone() return pClone; } - - void MetaPieAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); @@ -785,8 +615,6 @@ void MetaPieAction::Move( long nHorzMove, long nVertMove ) maEndPt.Move( nHorzMove, nVertMove ); } - - void MetaPieAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); @@ -794,8 +622,6 @@ void MetaPieAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maEndPt, fScaleX, fScaleY ); } - - bool MetaPieAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaPieAction&)rMetaAction).maRect ) && @@ -803,8 +629,6 @@ bool MetaPieAction::Compare( const MetaAction& rMetaAction ) const ( maEndPt == ((MetaPieAction&)rMetaAction).maEndPt ); } - - void MetaPieAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -813,8 +637,6 @@ void MetaPieAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WritePair( rOStm, maEndPt ); } - - void MetaPieAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -823,12 +645,8 @@ void MetaPieAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maEndPt ); } - - IMPL_META_ACTION( Chord, META_CHORD_ACTION ) - - MetaChordAction::MetaChordAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ) : MetaAction ( META_CHORD_ACTION ), @@ -838,15 +656,11 @@ MetaChordAction::MetaChordAction( const Rectangle& rRect, { } - - void MetaChordAction::Execute( OutputDevice* pOut ) { pOut->DrawChord( maRect, maStartPt, maEndPt ); } - - MetaAction* MetaChordAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaChordAction( *this ); @@ -854,8 +668,6 @@ MetaAction* MetaChordAction::Clone() return pClone; } - - void MetaChordAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); @@ -863,8 +675,6 @@ void MetaChordAction::Move( long nHorzMove, long nVertMove ) maEndPt.Move( nHorzMove, nVertMove ); } - - void MetaChordAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); @@ -872,8 +682,6 @@ void MetaChordAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maEndPt, fScaleX, fScaleY ); } - - bool MetaChordAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaChordAction&)rMetaAction).maRect ) && @@ -881,8 +689,6 @@ bool MetaChordAction::Compare( const MetaAction& rMetaAction ) const ( maEndPt == ((MetaChordAction&)rMetaAction).maEndPt ); } - - void MetaChordAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -891,8 +697,6 @@ void MetaChordAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WritePair( rOStm, maEndPt ); } - - void MetaChordAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -901,20 +705,14 @@ void MetaChordAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maEndPt ); } - - IMPL_META_ACTION( PolyLine, META_POLYLINE_ACTION ) - - MetaPolyLineAction::MetaPolyLineAction( const Polygon& rPoly ) : MetaAction ( META_POLYLINE_ACTION ), maPoly ( rPoly ) { } - - MetaPolyLineAction::MetaPolyLineAction( const Polygon& rPoly, const LineInfo& rLineInfo ) : MetaAction ( META_POLYLINE_ACTION ), maLineInfo ( rLineInfo ), @@ -922,8 +720,6 @@ MetaPolyLineAction::MetaPolyLineAction( const Polygon& rPoly, const LineInfo& rL { } - - void MetaPolyLineAction::Execute( OutputDevice* pOut ) { if( maLineInfo.IsDefault() ) @@ -932,8 +728,6 @@ void MetaPolyLineAction::Execute( OutputDevice* pOut ) pOut->DrawPolyLine( maPoly, maLineInfo ); } - - MetaAction* MetaPolyLineAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPolyLineAction( *this ); @@ -941,23 +735,17 @@ MetaAction* MetaPolyLineAction::Clone() return pClone; } - - void MetaPolyLineAction::Move( long nHorzMove, long nVertMove ) { maPoly.Move( nHorzMove, nVertMove ); } - - void MetaPolyLineAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoly( maPoly, fScaleX, fScaleY ); ImplScaleLineInfo( maLineInfo, fScaleX, fScaleY ); } - - bool MetaPolyLineAction::Compare( const MetaAction& rMetaAction ) const { bool bIsEqual = true; @@ -969,8 +757,6 @@ bool MetaPolyLineAction::Compare( const MetaAction& rMetaAction ) const } - - void MetaPolyLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 3, pData ); @@ -987,8 +773,6 @@ void MetaPolyLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) maPoly.Write( rOStm ); } - - void MetaPolyLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -1008,27 +792,19 @@ void MetaPolyLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } - - IMPL_META_ACTION( Polygon, META_POLYGON_ACTION ) - - MetaPolygonAction::MetaPolygonAction( const Polygon& rPoly ) : MetaAction ( META_POLYGON_ACTION ), maPoly ( rPoly ) { } - - void MetaPolygonAction::Execute( OutputDevice* pOut ) { pOut->DrawPolygon( maPoly ); } - - MetaAction* MetaPolygonAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPolygonAction( *this ); @@ -1036,29 +812,21 @@ MetaAction* MetaPolygonAction::Clone() return pClone; } - - void MetaPolygonAction::Move( long nHorzMove, long nVertMove ) { maPoly.Move( nHorzMove, nVertMove ); } - - void MetaPolygonAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoly( maPoly, fScaleX, fScaleY ); } - - bool MetaPolygonAction::Compare( const MetaAction& rMetaAction ) const { return maPoly.IsEqual(((MetaPolygonAction&)rMetaAction).maPoly ); } - - void MetaPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); @@ -1073,8 +841,6 @@ void MetaPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) maPoly.Write( rOStm ); } - - void MetaPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -1090,27 +856,19 @@ void MetaPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } - - IMPL_META_ACTION( PolyPolygon, META_POLYPOLYGON_ACTION ) - - MetaPolyPolygonAction::MetaPolyPolygonAction( const PolyPolygon& rPolyPoly ) : MetaAction ( META_POLYPOLYGON_ACTION ), maPolyPoly ( rPolyPoly ) { } - - void MetaPolyPolygonAction::Execute( OutputDevice* pOut ) { pOut->DrawPolyPolygon( maPolyPoly ); } - - MetaAction* MetaPolyPolygonAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPolyPolygonAction( *this ); @@ -1118,30 +876,22 @@ MetaAction* MetaPolyPolygonAction::Clone() return pClone; } - - void MetaPolyPolygonAction::Move( long nHorzMove, long nVertMove ) { maPolyPoly.Move( nHorzMove, nVertMove ); } - - void MetaPolyPolygonAction::Scale( double fScaleX, double fScaleY ) { for( sal_uInt16 i = 0, nCount = maPolyPoly.Count(); i < nCount; i++ ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } - - bool MetaPolyPolygonAction::Compare( const MetaAction& rMetaAction ) const { return maPolyPoly.IsEqual(((MetaPolyPolygonAction&)rMetaAction).maPolyPoly ); } - - void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); @@ -1174,8 +924,6 @@ void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaPolyPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -1196,12 +944,8 @@ void MetaPolyPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } - - IMPL_META_ACTION( Text, META_TEXT_ACTION ) - - MetaTextAction::MetaTextAction( const Point& rPt, const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ) : MetaAction ( META_TEXT_ACTION ), @@ -1212,15 +956,11 @@ MetaTextAction::MetaTextAction( const Point& rPt, const OUString& rStr, { } - - void MetaTextAction::Execute( OutputDevice* pOut ) { pOut->DrawText( maPt, maStr, mnIndex, mnLen ); } - - MetaAction* MetaTextAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextAction( *this ); @@ -1228,22 +968,16 @@ MetaAction* MetaTextAction::Clone() return pClone; } - - void MetaTextAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaTextAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } - - bool MetaTextAction::Compare( const MetaAction& rMetaAction ) const { return ( maPt == ((MetaTextAction&)rMetaAction).maPt ) && @@ -1252,8 +986,6 @@ bool MetaTextAction::Compare( const MetaAction& rMetaAction ) const ( mnLen == ((MetaTextAction&)rMetaAction).mnLen ); } - - void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); @@ -1265,8 +997,6 @@ void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2 } - - void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); @@ -1283,8 +1013,6 @@ void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) maStr = read_uInt16_lenPrefixed_uInt16s_ToOUString(rIStm); } - - MetaTextArrayAction::MetaTextArrayAction() : MetaAction ( META_TEXTARRAY_ACTION ), mpDXAry ( NULL ), @@ -1293,8 +1021,6 @@ MetaTextArrayAction::MetaTextArrayAction() : { } - - MetaTextArrayAction::MetaTextArrayAction( const MetaTextArrayAction& rAction ) : MetaAction ( META_TEXTARRAY_ACTION ), maStartPt ( rAction.maStartPt ), @@ -1313,8 +1039,6 @@ MetaTextArrayAction::MetaTextArrayAction( const MetaTextArrayAction& rAction ) : mpDXAry = NULL; } - - MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt, const OUString& rStr, const sal_Int32* pDXAry, @@ -1337,22 +1061,16 @@ MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt, mpDXAry = NULL; } - - MetaTextArrayAction::~MetaTextArrayAction() { delete[] mpDXAry; } - - void MetaTextArrayAction::Execute( OutputDevice* pOut ) { pOut->DrawTextArray( maStartPt, maStr, mpDXAry, mnIndex, mnLen ); } - - MetaAction* MetaTextArrayAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextArrayAction( *this ); @@ -1360,15 +1078,11 @@ MetaAction* MetaTextArrayAction::Clone() return pClone; } - - void MetaTextArrayAction::Move( long nHorzMove, long nVertMove ) { maStartPt.Move( nHorzMove, nVertMove ); } - - void MetaTextArrayAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maStartPt, fScaleX, fScaleY ); @@ -1380,8 +1094,6 @@ void MetaTextArrayAction::Scale( double fScaleX, double fScaleY ) } } - - bool MetaTextArrayAction::Compare( const MetaAction& rMetaAction ) const { return ( maStartPt == ((MetaTextArrayAction&)rMetaAction).maStartPt ) && @@ -1391,8 +1103,6 @@ bool MetaTextArrayAction::Compare( const MetaAction& rMetaAction ) const ( memcmp( mpDXAry, ((MetaTextArrayAction&)rMetaAction).mpDXAry, mnLen ) == 0 ); } - - void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { const sal_Int32 nAryLen = mpDXAry ? mnLen : 0; @@ -1410,8 +1120,6 @@ void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2 } - - void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { sal_Int32 nAryLen; @@ -1476,12 +1184,8 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) } } - - IMPL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION ) - - MetaStretchTextAction::MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidth, const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ) : @@ -1494,15 +1198,11 @@ MetaStretchTextAction::MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidt { } - - void MetaStretchTextAction::Execute( OutputDevice* pOut ) { pOut->DrawStretchText( maPt, mnWidth, maStr, mnIndex, mnLen ); } - - MetaAction* MetaStretchTextAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaStretchTextAction( *this ); @@ -1510,23 +1210,17 @@ MetaAction* MetaStretchTextAction::Clone() return pClone; } - - void MetaStretchTextAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaStretchTextAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); mnWidth = (sal_uLong)FRound( mnWidth * fabs(fScaleX) ); } - - bool MetaStretchTextAction::Compare( const MetaAction& rMetaAction ) const { return ( maPt == ((MetaStretchTextAction&)rMetaAction).maPt ) && @@ -1536,8 +1230,6 @@ bool MetaStretchTextAction::Compare( const MetaAction& rMetaAction ) const ( mnLen == ((MetaStretchTextAction&)rMetaAction).mnLen ); } - - void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); @@ -1550,8 +1242,6 @@ void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2 } - - void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); @@ -1569,12 +1259,8 @@ void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) maStr = read_uInt16_lenPrefixed_uInt16s_ToOUString(rIStm); } - - IMPL_META_ACTION( TextRect, META_TEXTRECT_ACTION ) - - MetaTextRectAction::MetaTextRectAction( const Rectangle& rRect, const OUString& rStr, sal_uInt16 nStyle ) : MetaAction ( META_TEXTRECT_ACTION ), @@ -1584,15 +1270,11 @@ MetaTextRectAction::MetaTextRectAction( const Rectangle& rRect, { } - - void MetaTextRectAction::Execute( OutputDevice* pOut ) { pOut->DrawText( maRect, maStr, mnStyle ); } - - MetaAction* MetaTextRectAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextRectAction( *this ); @@ -1600,22 +1282,16 @@ MetaAction* MetaTextRectAction::Clone() return pClone; } - - void MetaTextRectAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } - - void MetaTextRectAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } - - bool MetaTextRectAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaTextRectAction&)rMetaAction).maRect ) && @@ -1623,8 +1299,6 @@ bool MetaTextRectAction::Compare( const MetaAction& rMetaAction ) const ( mnStyle == ((MetaTextRectAction&)rMetaAction).mnStyle ); } - - void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); @@ -1635,8 +1309,6 @@ void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2 } - - void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); @@ -1648,12 +1320,8 @@ void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) maStr = read_uInt16_lenPrefixed_uInt16s_ToOUString(rIStm); } - - IMPL_META_ACTION( TextLine, META_TEXTLINE_ACTION ) - - MetaTextLineAction::MetaTextLineAction( const Point& rPos, long nWidth, FontStrikeout eStrikeout, FontUnderline eUnderline, @@ -1667,15 +1335,11 @@ MetaTextLineAction::MetaTextLineAction( const Point& rPos, long nWidth, { } - - void MetaTextLineAction::Execute( OutputDevice* pOut ) { pOut->DrawTextLine( maPos, mnWidth, meStrikeout, meUnderline, meOverline ); } - - MetaAction* MetaTextLineAction::Clone() { MetaAction* pClone = (MetaAction*)new MetaTextLineAction( *this ); @@ -1683,23 +1347,17 @@ MetaAction* MetaTextLineAction::Clone() return pClone; } - - void MetaTextLineAction::Move( long nHorzMove, long nVertMove ) { maPos.Move( nHorzMove, nVertMove ); } - - void MetaTextLineAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPos, fScaleX, fScaleY ); mnWidth = FRound( mnWidth * fabs(fScaleX) ); } - - bool MetaTextLineAction::Compare( const MetaAction& rMetaAction ) const { return ( maPos == ((MetaTextLineAction&)rMetaAction).maPos ) && @@ -1709,8 +1367,6 @@ bool MetaTextLineAction::Compare( const MetaAction& rMetaAction ) const ( meOverline == ((MetaTextLineAction&)rMetaAction).meOverline ); } - - void MetaTextLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); @@ -1724,8 +1380,6 @@ void MetaTextLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUInt32( static_cast<sal_uInt32>(meOverline) ); } - - void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -1748,12 +1402,8 @@ void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } - - IMPL_META_ACTION( Bmp, META_BMP_ACTION ) - - MetaBmpAction::MetaBmpAction( const Point& rPt, const Bitmap& rBmp ) : MetaAction ( META_BMP_ACTION ), maBmp ( rBmp ), @@ -1761,15 +1411,11 @@ MetaBmpAction::MetaBmpAction( const Point& rPt, const Bitmap& rBmp ) : { } - - void MetaBmpAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmap( maPt, maBmp ); } - - MetaAction* MetaBmpAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaBmpAction( *this ); @@ -1777,30 +1423,22 @@ MetaAction* MetaBmpAction::Clone() return pClone; } - - void MetaBmpAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaBmpAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } - - bool MetaBmpAction::Compare( const MetaAction& rMetaAction ) const { return maBmp.IsEqual(((MetaBmpAction&)rMetaAction).maBmp ) && ( maPt == ((MetaBmpAction&)rMetaAction).maPt ); } - - void MetaBmpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -1811,8 +1449,6 @@ void MetaBmpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaBmpAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -1820,12 +1456,8 @@ void MetaBmpAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maPt ); } - - IMPL_META_ACTION( BmpScale, META_BMPSCALE_ACTION ) - - MetaBmpScaleAction::MetaBmpScaleAction( const Point& rPt, const Size& rSz, const Bitmap& rBmp ) : MetaAction ( META_BMPSCALE_ACTION ), @@ -1835,15 +1467,11 @@ MetaBmpScaleAction::MetaBmpScaleAction( const Point& rPt, const Size& rSz, { } - - void MetaBmpScaleAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmap( maPt, maSz, maBmp ); } - - MetaAction* MetaBmpScaleAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaBmpScaleAction( *this ); @@ -1851,15 +1479,11 @@ MetaAction* MetaBmpScaleAction::Clone() return pClone; } - - void MetaBmpScaleAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaBmpScaleAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maPt, maSz); @@ -1868,8 +1492,6 @@ void MetaBmpScaleAction::Scale( double fScaleX, double fScaleY ) maSz = aRectangle.GetSize(); } - - bool MetaBmpScaleAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmp.IsEqual(((MetaBmpScaleAction&)rMetaAction).maBmp )) && @@ -1877,8 +1499,6 @@ bool MetaBmpScaleAction::Compare( const MetaAction& rMetaAction ) const ( maSz == ((MetaBmpScaleAction&)rMetaAction).maSz ); } - - void MetaBmpScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -1890,8 +1510,6 @@ void MetaBmpScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaBmpScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -1900,12 +1518,8 @@ void MetaBmpScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSz ); } - - IMPL_META_ACTION( BmpScalePart, META_BMPSCALEPART_ACTION ) - - MetaBmpScalePartAction::MetaBmpScalePartAction( const Point& rDstPt, const Size& rDstSz, const Point& rSrcPt, const Size& rSrcSz, const Bitmap& rBmp ) : @@ -1918,15 +1532,11 @@ MetaBmpScalePartAction::MetaBmpScalePartAction( const Point& rDstPt, const Size& { } - - void MetaBmpScalePartAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmap( maDstPt, maDstSz, maSrcPt, maSrcSz, maBmp ); } - - MetaAction* MetaBmpScalePartAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaBmpScalePartAction( *this ); @@ -1934,15 +1544,11 @@ MetaAction* MetaBmpScalePartAction::Clone() return pClone; } - - void MetaBmpScalePartAction::Move( long nHorzMove, long nVertMove ) { maDstPt.Move( nHorzMove, nVertMove ); } - - void MetaBmpScalePartAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maDstPt, maDstSz); @@ -1951,8 +1557,6 @@ void MetaBmpScalePartAction::Scale( double fScaleX, double fScaleY ) maDstSz = aRectangle.GetSize(); } - - bool MetaBmpScalePartAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmp.IsEqual(((MetaBmpScalePartAction&)rMetaAction).maBmp )) && @@ -1962,8 +1566,6 @@ bool MetaBmpScalePartAction::Compare( const MetaAction& rMetaAction ) const ( maSrcSz == ((MetaBmpScalePartAction&)rMetaAction).maSrcSz ); } - - void MetaBmpScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -1977,8 +1579,6 @@ void MetaBmpScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaBmpScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -1989,12 +1589,8 @@ void MetaBmpScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSrcSz ); } - - IMPL_META_ACTION( BmpEx, META_BMPEX_ACTION ) - - MetaBmpExAction::MetaBmpExAction( const Point& rPt, const BitmapEx& rBmpEx ) : MetaAction ( META_BMPEX_ACTION ), maBmpEx ( rBmpEx ), @@ -2002,15 +1598,11 @@ MetaBmpExAction::MetaBmpExAction( const Point& rPt, const BitmapEx& rBmpEx ) : { } - - void MetaBmpExAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmapEx( maPt, maBmpEx ); } - - MetaAction* MetaBmpExAction::Clone() { MetaBmpExAction* pClone = new MetaBmpExAction( *this ); @@ -2018,30 +1610,22 @@ MetaAction* MetaBmpExAction::Clone() return pClone; } - - void MetaBmpExAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaBmpExAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } - - bool MetaBmpExAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmpEx.IsEqual(((MetaBmpExAction&)rMetaAction).maBmpEx )) && ( maPt == ((MetaBmpExAction&)rMetaAction).maPt ); } - - void MetaBmpExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmpEx.GetBitmap() ) @@ -2052,8 +1636,6 @@ void MetaBmpExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaBmpExAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2061,12 +1643,8 @@ void MetaBmpExAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maPt ); } - - IMPL_META_ACTION( BmpExScale, META_BMPEXSCALE_ACTION ) - - MetaBmpExScaleAction::MetaBmpExScaleAction( const Point& rPt, const Size& rSz, const BitmapEx& rBmpEx ) : MetaAction ( META_BMPEXSCALE_ACTION ), @@ -2076,15 +1654,11 @@ MetaBmpExScaleAction::MetaBmpExScaleAction( const Point& rPt, const Size& rSz, { } - - void MetaBmpExScaleAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmapEx( maPt, maSz, maBmpEx ); } - - MetaAction* MetaBmpExScaleAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaBmpExScaleAction( *this ); @@ -2092,15 +1666,11 @@ MetaAction* MetaBmpExScaleAction::Clone() return pClone; } - - void MetaBmpExScaleAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaBmpExScaleAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maPt, maSz); @@ -2109,8 +1679,6 @@ void MetaBmpExScaleAction::Scale( double fScaleX, double fScaleY ) maSz = aRectangle.GetSize(); } - - bool MetaBmpExScaleAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmpEx.IsEqual(((MetaBmpExScaleAction&)rMetaAction).maBmpEx )) && @@ -2118,8 +1686,6 @@ bool MetaBmpExScaleAction::Compare( const MetaAction& rMetaAction ) const ( maSz == ((MetaBmpExScaleAction&)rMetaAction).maSz ); } - - void MetaBmpExScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmpEx.GetBitmap() ) @@ -2131,8 +1697,6 @@ void MetaBmpExScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaBmpExScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2141,12 +1705,8 @@ void MetaBmpExScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSz ); } - - IMPL_META_ACTION( BmpExScalePart, META_BMPEXSCALEPART_ACTION ) - - MetaBmpExScalePartAction::MetaBmpExScalePartAction( const Point& rDstPt, const Size& rDstSz, const Point& rSrcPt, const Size& rSrcSz, const BitmapEx& rBmpEx ) : @@ -2159,15 +1719,11 @@ MetaBmpExScalePartAction::MetaBmpExScalePartAction( const Point& rDstPt, const S { } - - void MetaBmpExScalePartAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmapEx( maDstPt, maDstSz, maSrcPt, maSrcSz, maBmpEx ); } - - MetaAction* MetaBmpExScalePartAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaBmpExScalePartAction( *this ); @@ -2175,15 +1731,11 @@ MetaAction* MetaBmpExScalePartAction::Clone() return pClone; } - - void MetaBmpExScalePartAction::Move( long nHorzMove, long nVertMove ) { maDstPt.Move( nHorzMove, nVertMove ); } - - void MetaBmpExScalePartAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maDstPt, maDstSz); @@ -2192,8 +1744,6 @@ void MetaBmpExScalePartAction::Scale( double fScaleX, double fScaleY ) maDstSz = aRectangle.GetSize(); } - - bool MetaBmpExScalePartAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmpEx.IsEqual(((MetaBmpExScalePartAction&)rMetaAction).maBmpEx )) && @@ -2203,8 +1753,6 @@ bool MetaBmpExScalePartAction::Compare( const MetaAction& rMetaAction ) const ( maSrcSz == ((MetaBmpExScalePartAction&)rMetaAction).maSrcSz ); } - - void MetaBmpExScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmpEx.GetBitmap() ) @@ -2218,8 +1766,6 @@ void MetaBmpExScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData } } - - void MetaBmpExScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2230,12 +1776,8 @@ void MetaBmpExScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSrcSz ); } - - IMPL_META_ACTION( Mask, META_MASK_ACTION ) - - MetaMaskAction::MetaMaskAction( const Point& rPt, const Bitmap& rBmp, const Color& rColor ) : @@ -2246,15 +1788,11 @@ MetaMaskAction::MetaMaskAction( const Point& rPt, { } - - void MetaMaskAction::Execute( OutputDevice* pOut ) { pOut->DrawMask( maPt, maBmp, maColor ); } - - MetaAction* MetaMaskAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaMaskAction( *this ); @@ -2262,22 +1800,16 @@ MetaAction* MetaMaskAction::Clone() return pClone; } - - void MetaMaskAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaMaskAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } - - bool MetaMaskAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmp.IsEqual(((MetaMaskAction&)rMetaAction).maBmp )) && @@ -2285,8 +1817,6 @@ bool MetaMaskAction::Compare( const MetaAction& rMetaAction ) const ( maPt == ((MetaMaskAction&)rMetaAction).maPt ); } - - void MetaMaskAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -2297,8 +1827,6 @@ void MetaMaskAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaMaskAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2306,12 +1834,8 @@ void MetaMaskAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maPt ); } - - IMPL_META_ACTION( MaskScale, META_MASKSCALE_ACTION ) - - MetaMaskScaleAction::MetaMaskScaleAction( const Point& rPt, const Size& rSz, const Bitmap& rBmp, const Color& rColor ) : @@ -2323,15 +1847,11 @@ MetaMaskScaleAction::MetaMaskScaleAction( const Point& rPt, const Size& rSz, { } - - void MetaMaskScaleAction::Execute( OutputDevice* pOut ) { pOut->DrawMask( maPt, maSz, maBmp, maColor ); } - - MetaAction* MetaMaskScaleAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaMaskScaleAction( *this ); @@ -2339,15 +1859,11 @@ MetaAction* MetaMaskScaleAction::Clone() return pClone; } - - void MetaMaskScaleAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } - - void MetaMaskScaleAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maPt, maSz); @@ -2356,8 +1872,6 @@ void MetaMaskScaleAction::Scale( double fScaleX, double fScaleY ) maSz = aRectangle.GetSize(); } - - bool MetaMaskScaleAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmp.IsEqual(((MetaMaskScaleAction&)rMetaAction).maBmp )) && @@ -2366,8 +1880,6 @@ bool MetaMaskScaleAction::Compare( const MetaAction& rMetaAction ) const ( maSz == ((MetaMaskScaleAction&)rMetaAction).maSz ); } - - void MetaMaskScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -2379,8 +1891,6 @@ void MetaMaskScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaMaskScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2389,12 +1899,8 @@ void MetaMaskScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSz ); } - - IMPL_META_ACTION( MaskScalePart, META_MASKSCALEPART_ACTION ) - - MetaMaskScalePartAction::MetaMaskScalePartAction( const Point& rDstPt, const Size& rDstSz, const Point& rSrcPt, const Size& rSrcSz, const Bitmap& rBmp, @@ -2409,15 +1915,11 @@ MetaMaskScalePartAction::MetaMaskScalePartAction( const Point& rDstPt, const Siz { } - - void MetaMaskScalePartAction::Execute( OutputDevice* pOut ) { pOut->DrawMask( maDstPt, maDstSz, maSrcPt, maSrcSz, maBmp, maColor ); } - - MetaAction* MetaMaskScalePartAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaMaskScalePartAction( *this ); @@ -2425,15 +1927,11 @@ MetaAction* MetaMaskScalePartAction::Clone() return pClone; } - - void MetaMaskScalePartAction::Move( long nHorzMove, long nVertMove ) { maDstPt.Move( nHorzMove, nVertMove ); } - - void MetaMaskScalePartAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maDstPt, maDstSz); @@ -2442,8 +1940,6 @@ void MetaMaskScalePartAction::Scale( double fScaleX, double fScaleY ) maDstSz = aRectangle.GetSize(); } - - bool MetaMaskScalePartAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmp.IsEqual(((MetaMaskScalePartAction&)rMetaAction).maBmp )) && @@ -2454,8 +1950,6 @@ bool MetaMaskScalePartAction::Compare( const MetaAction& rMetaAction ) const ( maSrcSz == ((MetaMaskScalePartAction&)rMetaAction).maSrcSz ); } - - void MetaMaskScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -2470,8 +1964,6 @@ void MetaMaskScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } - - void MetaMaskScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2483,12 +1975,8 @@ void MetaMaskScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSrcSz ); } - - IMPL_META_ACTION( Gradient, META_GRADIENT_ACTION ) - - MetaGradientAction::MetaGradientAction( const Rectangle& rRect, const Gradient& rGradient ) : MetaAction ( META_GRADIENT_ACTION ), maRect ( rRect ), @@ -2496,15 +1984,11 @@ MetaGradientAction::MetaGradientAction( const Rectangle& rRect, const Gradient& { } - - void MetaGradientAction::Execute( OutputDevice* pOut ) { pOut->DrawGradient( maRect, maGradient ); } - - MetaAction* MetaGradientAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaGradientAction( *this ); @@ -2512,30 +1996,22 @@ MetaAction* MetaGradientAction::Clone() return pClone; } - - void MetaGradientAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } - - void MetaGradientAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } - - bool MetaGradientAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaGradientAction&)rMetaAction).maRect ) && ( maGradient == ((MetaGradientAction&)rMetaAction).maGradient ); } - - void MetaGradientAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -2543,8 +2019,6 @@ void MetaGradientAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WriteGradient( rOStm, maGradient ); } - - void MetaGradientAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2552,15 +2026,11 @@ void MetaGradientAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadGradient( rIStm, maGradient ); } - - MetaGradientExAction::MetaGradientExAction() : MetaAction ( META_GRADIENTEX_ACTION ) { } - - MetaGradientExAction::MetaGradientExAction( const PolyPolygon& rPolyPoly, const Gradient& rGradient ) : MetaAction ( META_GRADIENTEX_ACTION ), maPolyPoly ( rPolyPoly ), @@ -2568,14 +2038,10 @@ MetaGradientExAction::MetaGradientExAction( const PolyPolygon& rPolyPoly, const { } - - MetaGradientExAction::~MetaGradientExAction() { } - - void MetaGradientExAction::Execute( OutputDevice* pOut ) { if( pOut->GetConnectMetaFile() ) @@ -2585,8 +2051,6 @@ void MetaGradientExAction::Execute( OutputDevice* pOut ) } } - - MetaAction* MetaGradientExAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaGradientExAction( *this ); @@ -2594,31 +2058,23 @@ MetaAction* MetaGradientExAction::Clone() return pClone; } - - void MetaGradientExAction::Move( long nHorzMove, long nVertMove ) { maPolyPoly.Move( nHorzMove, nVertMove ); } - - void MetaGradientExAction::Scale( double fScaleX, double fScaleY ) { for( sal_uInt16 i = 0, nCount = maPolyPoly.Count(); i < nCount; i++ ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } - - bool MetaGradientExAction::Compare( const MetaAction& rMetaAction ) const { return ( maPolyPoly == ((MetaGradientExAction&)rMetaAction).maPolyPoly ) && ( maGradient == ((MetaGradientExAction&)rMetaAction).maGradient ); } - - void MetaGradientExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -2631,8 +2087,6 @@ void MetaGradientExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WriteGradient( rOStm, maGradient ); } - - void MetaGradientExAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2640,12 +2094,8 @@ void MetaGradientExAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadGradient( rIStm, maGradient ); } - - IMPL_META_ACTION( Hatch, META_HATCH_ACTION ) - - MetaHatchAction::MetaHatchAction( const PolyPolygon& rPolyPoly, const Hatch& rHatch ) : MetaAction ( META_HATCH_ACTION ), maPolyPoly ( rPolyPoly ), @@ -2653,15 +2103,11 @@ MetaHatchAction::MetaHatchAction( const PolyPolygon& rPolyPoly, const Hatch& rHa { } - - void MetaHatchAction::Execute( OutputDevice* pOut ) { pOut->DrawHatch( maPolyPoly, maHatch ); } - - MetaAction* MetaHatchAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaHatchAction( *this ); @@ -2669,31 +2115,23 @@ MetaAction* MetaHatchAction::Clone() return pClone; } - - void MetaHatchAction::Move( long nHorzMove, long nVertMove ) { maPolyPoly.Move( nHorzMove, nVertMove ); } - - void MetaHatchAction::Scale( double fScaleX, double fScaleY ) { for( sal_uInt16 i = 0, nCount = maPolyPoly.Count(); i < nCount; i++ ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } - - bool MetaHatchAction::Compare( const MetaAction& rMetaAction ) const { return ( maPolyPoly == ((MetaHatchAction&)rMetaAction).maPolyPoly ) && ( maHatch == ((MetaHatchAction&)rMetaAction).maHatch ); } - - void MetaHatchAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -2706,8 +2144,6 @@ void MetaHatchAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WriteHatch( rOStm, maHatch ); } - - void MetaHatchAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2715,12 +2151,8 @@ void MetaHatchAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadHatch( rIStm, maHatch ); } - - IMPL_META_ACTION( Wallpaper, META_WALLPAPER_ACTION ) - - MetaWallpaperAction::MetaWallpaperAction( const Rectangle& rRect, const Wallpaper& rPaper ) : MetaAction ( META_WALLPAPER_ACTION ), @@ -2729,15 +2161,11 @@ MetaWallpaperAction::MetaWallpaperAction( const Rectangle& rRect, { } - - void MetaWallpaperAction::Execute( OutputDevice* pOut ) { pOut->DrawWallpaper( maRect, maWallpaper ); } - - MetaAction* MetaWallpaperAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaWallpaperAction( *this ); @@ -2745,50 +2173,36 @@ MetaAction* MetaWallpaperAction::Clone() return pClone; } - - void MetaWallpaperAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } - - void MetaWallpaperAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } - - bool MetaWallpaperAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaWallpaperAction&)rMetaAction).maRect ) && ( maWallpaper == ((MetaWallpaperAction&)rMetaAction).maWallpaper ); } - - void MetaWallpaperAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); WriteWallpaper( rOStm, maWallpaper ); } - - void MetaWallpaperAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadWallpaper( rIStm, maWallpaper ); } - - IMPL_META_ACTION( ClipRegion, META_CLIPREGION_ACTION ) - - MetaClipRegionAction::MetaClipRegionAction( const Region& rRegion, bool bClip ) : MetaAction ( META_CLIPREGION_ACTION ), maRegion ( rRegion ), @@ -2796,8 +2210,6 @@ MetaClipRegionAction::MetaClipRegionAction( const Region& rRegion, bool bClip ) { } - - void MetaClipRegionAction::Execute( OutputDevice* pOut ) { if( mbClip ) @@ -2806,8 +2218,6 @@ void MetaClipRegionAction::Execute( OutputDevice* pOut ) pOut->SetClipRegion(); } - - MetaAction* MetaClipRegionAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaClipRegionAction( *this ); @@ -2815,30 +2225,22 @@ MetaAction* MetaClipRegionAction::Clone() return pClone; } - - void MetaClipRegionAction::Move( long nHorzMove, long nVertMove ) { maRegion.Move( nHorzMove, nVertMove ); } - - void MetaClipRegionAction::Scale( double fScaleX, double fScaleY ) { maRegion.Scale( fScaleX, fScaleY ); } - - bool MetaClipRegionAction::Compare( const MetaAction& rMetaAction ) const { return ( maRegion == ((MetaClipRegionAction&)rMetaAction).maRegion ) && ( mbClip == ((MetaClipRegionAction&)rMetaAction).mbClip ); } - - void MetaClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -2846,8 +2248,6 @@ void MetaClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbClip ); } - - void MetaClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -2855,27 +2255,19 @@ void MetaClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbClip ); } - - IMPL_META_ACTION( ISectRectClipRegion, META_ISECTRECTCLIPREGION_ACTION ) - - MetaISectRectClipRegionAction::MetaISectRectClipRegionAction( const Rectangle& rRect ) : MetaAction ( META_ISECTRECTCLIPREGION_ACTION ), maRect ( rRect ) { } - - void MetaISectRectClipRegionAction::Execute( OutputDevice* pOut ) { pOut->IntersectClipRegion( maRect ); } - - MetaAction* MetaISectRectClipRegionAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaISectRectClipRegionAction( *this ); @@ -2883,64 +2275,46 @@ MetaAction* MetaISectRectClipRegionAction::Clone() return pClone; } - - void MetaISectRectClipRegionAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } - - void MetaISectRectClipRegionAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } - - bool MetaISectRectClipRegionAction::Compare( const MetaAction& rMetaAction ) const { return maRect == ((MetaISectRectClipRegionAction&)rMetaAction).maRect; } - - void MetaISectRectClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); WriteRectangle( rOStm, maRect ); } - - void MetaISectRectClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadRectangle( rIStm, maRect ); } - - IMPL_META_ACTION( ISectRegionClipRegion, META_ISECTREGIONCLIPREGION_ACTION ) - - MetaISectRegionClipRegionAction::MetaISectRegionClipRegionAction( const Region& rRegion ) : MetaAction ( META_ISECTREGIONCLIPREGION_ACTION ), maRegion ( rRegion ) { } - - void MetaISectRegionClipRegionAction::Execute( OutputDevice* pOut ) { pOut->IntersectClipRegion( maRegion ); } - - MetaAction* MetaISectRegionClipRegionAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaISectRegionClipRegionAction( *this ); @@ -2948,49 +2322,35 @@ MetaAction* MetaISectRegionClipRegionAction::Clone() return pClone; } - - void MetaISectRegionClipRegionAction::Move( long nHorzMove, long nVertMove ) { maRegion.Move( nHorzMove, nVertMove ); } - - void MetaISectRegionClipRegionAction::Scale( double fScaleX, double fScaleY ) { maRegion.Scale( fScaleX, fScaleY ); } - - bool MetaISectRegionClipRegionAction::Compare( const MetaAction& rMetaAction ) const { return maRegion == ((MetaISectRegionClipRegionAction&)rMetaAction).maRegion; } - - void MetaISectRegionClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); WriteRegion( rOStm, maRegion ); } - - void MetaISectRegionClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadRegion( rIStm, maRegion ); } - - IMPL_META_ACTION( MoveClipRegion, META_MOVECLIPREGION_ACTION ) - - MetaMoveClipRegionAction::MetaMoveClipRegionAction( long nHorzMove, long nVertMove ) : MetaAction ( META_MOVECLIPREGION_ACTION ), mnHorzMove ( nHorzMove ), @@ -2998,15 +2358,11 @@ MetaMoveClipRegionAction::MetaMoveClipRegionAction( long nHorzMove, long nVertMo { } - - void MetaMoveClipRegionAction::Execute( OutputDevice* pOut ) { pOut->MoveClipRegion( mnHorzMove, mnVertMove ); } - - MetaAction* MetaMoveClipRegionAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaMoveClipRegionAction( *this ); @@ -3014,24 +2370,18 @@ MetaAction* MetaMoveClipRegionAction::Clone() return pClone; } - - void MetaMoveClipRegionAction::Scale( double fScaleX, double fScaleY ) { mnHorzMove = FRound( mnHorzMove * fScaleX ); mnVertMove = FRound( mnVertMove * fScaleY ); } - - bool MetaMoveClipRegionAction::Compare( const MetaAction& rMetaAction ) const { return ( mnHorzMove == ((MetaMoveClipRegionAction&)rMetaAction).mnHorzMove ) && ( mnVertMove == ((MetaMoveClipRegionAction&)rMetaAction).mnVertMove ); } - - void MetaMoveClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3039,8 +2389,6 @@ void MetaMoveClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(mnHorzMove) ).WriteInt32( sal::static_int_cast<sal_Int32>(mnVertMove) ); } - - void MetaMoveClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3051,12 +2399,8 @@ void MetaMoveClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) mnVertMove = nTmpVM; } - - IMPL_META_ACTION( LineColor, META_LINECOLOR_ACTION ) - - MetaLineColorAction::MetaLineColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_LINECOLOR_ACTION ), maColor ( rColor ), @@ -3064,8 +2408,6 @@ MetaLineColorAction::MetaLineColorAction( const Color& rColor, bool bSet ) : { } - - void MetaLineColorAction::Execute( OutputDevice* pOut ) { if( mbSet ) @@ -3074,8 +2416,6 @@ void MetaLineColorAction::Execute( OutputDevice* pOut ) pOut->SetLineColor(); } - - MetaAction* MetaLineColorAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaLineColorAction( *this ); @@ -3083,16 +2423,12 @@ MetaAction* MetaLineColorAction::Clone() return pClone; } - - bool MetaLineColorAction::Compare( const MetaAction& rMetaAction ) const { return ( maColor == ((MetaLineColorAction&)rMetaAction).maColor ) && ( mbSet == ((MetaLineColorAction&)rMetaAction).mbSet ); } - - void MetaLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3100,8 +2436,6 @@ void MetaLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } - - void MetaLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3109,12 +2443,8 @@ void MetaLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } - - IMPL_META_ACTION( FillColor, META_FILLCOLOR_ACTION ) - - MetaFillColorAction::MetaFillColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_FILLCOLOR_ACTION ), maColor ( rColor ), @@ -3122,8 +2452,6 @@ MetaFillColorAction::MetaFillColorAction( const Color& rColor, bool bSet ) : { } - - void MetaFillColorAction::Execute( OutputDevice* pOut ) { if( mbSet ) @@ -3132,8 +2460,6 @@ void MetaFillColorAction::Execute( OutputDevice* pOut ) pOut->SetFillColor(); } - - MetaAction* MetaFillColorAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaFillColorAction( *this ); @@ -3141,16 +2467,12 @@ MetaAction* MetaFillColorAction::Clone() return pClone; } - - bool MetaFillColorAction::Compare( const MetaAction& rMetaAction ) const { return ( maColor == ((MetaFillColorAction&)rMetaAction).maColor ) && ( mbSet == ((MetaFillColorAction&)rMetaAction).mbSet ); } - - void MetaFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3158,8 +2480,6 @@ void MetaFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } - - void MetaFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3167,27 +2487,19 @@ void MetaFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } - - IMPL_META_ACTION( TextColor, META_TEXTCOLOR_ACTION ) - - MetaTextColorAction::MetaTextColorAction( const Color& rColor ) : MetaAction ( META_TEXTCOLOR_ACTION ), maColor ( rColor ) { } - - void MetaTextColorAction::Execute( OutputDevice* pOut ) { pOut->SetTextColor( maColor ); } - - MetaAction* MetaTextColorAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextColorAction( *this ); @@ -3195,35 +2507,25 @@ MetaAction* MetaTextColorAction::Clone() return pClone; } - - bool MetaTextColorAction::Compare( const MetaAction& rMetaAction ) const { return maColor == ((MetaTextColorAction&)rMetaAction).maColor; } - - void MetaTextColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); maColor.Write( rOStm, true ); } - - void MetaTextColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); maColor.Read( rIStm, true ); } - - IMPL_META_ACTION( TextFillColor, META_TEXTFILLCOLOR_ACTION ) - - MetaTextFillColorAction::MetaTextFillColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_TEXTFILLCOLOR_ACTION ), maColor ( rColor ), @@ -3231,8 +2533,6 @@ MetaTextFillColorAction::MetaTextFillColorAction( const Color& rColor, bool bSet { } - - void MetaTextFillColorAction::Execute( OutputDevice* pOut ) { if( mbSet ) @@ -3241,8 +2541,6 @@ void MetaTextFillColorAction::Execute( OutputDevice* pOut ) pOut->SetTextFillColor(); } - - MetaAction* MetaTextFillColorAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextFillColorAction( *this ); @@ -3250,16 +2548,12 @@ MetaAction* MetaTextFillColorAction::Clone() return pClone; } - - bool MetaTextFillColorAction::Compare( const MetaAction& rMetaAction ) const { return ( maColor == ((MetaTextFillColorAction&)rMetaAction).maColor ) && ( mbSet == ((MetaTextFillColorAction&)rMetaAction).mbSet ); } - - void MetaTextFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3267,8 +2561,6 @@ void MetaTextFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } - - void MetaTextFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3276,12 +2568,8 @@ void MetaTextFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } - - IMPL_META_ACTION( TextLineColor, META_TEXTLINECOLOR_ACTION ) - - MetaTextLineColorAction::MetaTextLineColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_TEXTLINECOLOR_ACTION ), maColor ( rColor ), @@ -3289,8 +2577,6 @@ MetaTextLineColorAction::MetaTextLineColorAction( const Color& rColor, bool bSet { } - - void MetaTextLineColorAction::Execute( OutputDevice* pOut ) { if( mbSet ) @@ -3299,8 +2585,6 @@ void MetaTextLineColorAction::Execute( OutputDevice* pOut ) pOut->SetTextLineColor(); } - - MetaAction* MetaTextLineColorAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextLineColorAction( *this ); @@ -3308,16 +2592,12 @@ MetaAction* MetaTextLineColorAction::Clone() return pClone; } - - bool MetaTextLineColorAction::Compare( const MetaAction& rMetaAction ) const { return ( maColor == ((MetaTextLineColorAction&)rMetaAction).maColor ) && ( mbSet == ((MetaTextLineColorAction&)rMetaAction).mbSet ); } - - void MetaTextLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3325,8 +2605,6 @@ void MetaTextLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } - - void MetaTextLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3334,12 +2612,8 @@ void MetaTextLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } - - IMPL_META_ACTION( OverlineColor, META_OVERLINECOLOR_ACTION ) - - MetaOverlineColorAction::MetaOverlineColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_OVERLINECOLOR_ACTION ), maColor ( rColor ), @@ -3347,8 +2621,6 @@ MetaOverlineColorAction::MetaOverlineColorAction( const Color& rColor, bool bSet { } - - void MetaOverlineColorAction::Execute( OutputDevice* pOut ) { if( mbSet ) @@ -3357,8 +2629,6 @@ void MetaOverlineColorAction::Execute( OutputDevice* pOut ) pOut->SetOverlineColor(); } - - MetaAction* MetaOverlineColorAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaOverlineColorAction( *this ); @@ -3366,16 +2636,12 @@ MetaAction* MetaOverlineColorAction::Clone() return pClone; } - - bool MetaOverlineColorAction::Compare( const MetaAction& rMetaAction ) const { return ( maColor == ((MetaOverlineColorAction&)rMetaAction).maColor ) && ( mbSet == ((MetaOverlineColorAction&)rMetaAction).mbSet ); } - - void MetaOverlineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3383,8 +2649,6 @@ void MetaOverlineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } - - void MetaOverlineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3392,27 +2656,19 @@ void MetaOverlineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } - - IMPL_META_ACTION( TextAlign, META_TEXTALIGN_ACTION ) - - MetaTextAlignAction::MetaTextAlignAction( TextAlign aAlign ) : MetaAction ( META_TEXTALIGN_ACTION ), maAlign ( aAlign ) { } - - void MetaTextAlignAction::Execute( OutputDevice* pOut ) { pOut->SetTextAlign( maAlign ); } - - MetaAction* MetaTextAlignAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextAlignAction( *this ); @@ -3420,23 +2676,17 @@ MetaAction* MetaTextAlignAction::Clone() return pClone; } - - bool MetaTextAlignAction::Compare( const MetaAction& rMetaAction ) const { return maAlign == ((MetaTextAlignAction&)rMetaAction).maAlign; } - - void MetaTextAlignAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); rOStm.WriteUInt16( (sal_uInt16) maAlign ); } - - void MetaTextAlignAction::Read( SvStream& rIStm, ImplMetaReadData* ) { sal_uInt16 nTmp16(0); @@ -3445,27 +2695,19 @@ void MetaTextAlignAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadUInt16( nTmp16 ); maAlign = (TextAlign) nTmp16; } - - IMPL_META_ACTION( MapMode, META_MAPMODE_ACTION ) - - MetaMapModeAction::MetaMapModeAction( const MapMode& rMapMode ) : MetaAction ( META_MAPMODE_ACTION ), maMapMode ( rMapMode ) { } - - void MetaMapModeAction::Execute( OutputDevice* pOut ) { pOut->SetMapMode( maMapMode ); } - - MetaAction* MetaMapModeAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaMapModeAction( *this ); @@ -3473,8 +2715,6 @@ MetaAction* MetaMapModeAction::Clone() return pClone; } - - void MetaMapModeAction::Scale( double fScaleX, double fScaleY ) { Point aPoint( maMapMode.GetOrigin() ); @@ -3483,35 +2723,25 @@ void MetaMapModeAction::Scale( double fScaleX, double fScaleY ) maMapMode.SetOrigin( aPoint ); } - - bool MetaMapModeAction::Compare( const MetaAction& rMetaAction ) const { return maMapMode == ((MetaMapModeAction&)rMetaAction).maMapMode; } - - void MetaMapModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); WriteMapMode( rOStm, maMapMode ); } - - void MetaMapModeAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadMapMode( rIStm, maMapMode ); } - - IMPL_META_ACTION( Font, META_FONT_ACTION ) - - MetaFontAction::MetaFontAction( const Font& rFont ) : MetaAction ( META_FONT_ACTION ), maFont ( rFont ) @@ -3527,15 +2757,11 @@ MetaFontAction::MetaFontAction( const Font& rFont ) : } } - - void MetaFontAction::Execute( OutputDevice* pOut ) { pOut->SetFont( maFont ); } - - MetaAction* MetaFontAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaFontAction( *this ); @@ -3543,8 +2769,6 @@ MetaAction* MetaFontAction::Clone() return pClone; } - - void MetaFontAction::Scale( double fScaleX, double fScaleY ) { const Size aSize( @@ -3553,15 +2777,11 @@ void MetaFontAction::Scale( double fScaleX, double fScaleY ) maFont.SetSize( aSize ); } - - bool MetaFontAction::Compare( const MetaAction& rMetaAction ) const { return maFont == ((MetaFontAction&)rMetaAction).maFont; } - - void MetaFontAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3571,8 +2791,6 @@ void MetaFontAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) pData->meActualCharSet = osl_getThreadTextEncoding(); } - - void MetaFontAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); @@ -3582,27 +2800,19 @@ void MetaFontAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) pData->meActualCharSet = osl_getThreadTextEncoding(); } - - IMPL_META_ACTION( Push, META_PUSH_ACTION ) - - MetaPushAction::MetaPushAction( sal_uInt16 nFlags ) : MetaAction ( META_PUSH_ACTION ), mnFlags ( nFlags ) { } - - void MetaPushAction::Execute( OutputDevice* pOut ) { pOut->Push( mnFlags ); } - - MetaAction* MetaPushAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPushAction( *this ); @@ -3610,42 +2820,30 @@ MetaAction* MetaPushAction::Clone() return pClone; } - - bool MetaPushAction::Compare( const MetaAction& rMetaAction ) const { return mnFlags == ((MetaPushAction&)rMetaAction).mnFlags; } - - void MetaPushAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); rOStm.WriteUInt16( mnFlags ); } - - void MetaPushAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); rIStm.ReadUInt16( mnFlags ); } - - IMPL_META_ACTION( Pop, META_POP_ACTION ) - - void MetaPopAction::Execute( OutputDevice* pOut ) { pOut->Pop(); } - - MetaAction* MetaPopAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaPopAction( *this ); @@ -3653,41 +2851,29 @@ MetaAction* MetaPopAction::Clone() return pClone; } - - void MetaPopAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); } - - void MetaPopAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); } - - IMPL_META_ACTION( RasterOp, META_RASTEROP_ACTION ) - - MetaRasterOpAction::MetaRasterOpAction( RasterOp eRasterOp ) : MetaAction ( META_RASTEROP_ACTION ), meRasterOp ( eRasterOp ) { } - - void MetaRasterOpAction::Execute( OutputDevice* pOut ) { pOut->SetRasterOp( meRasterOp ); } - - MetaAction* MetaRasterOpAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaRasterOpAction( *this ); @@ -3695,23 +2881,17 @@ MetaAction* MetaRasterOpAction::Clone() return pClone; } - - bool MetaRasterOpAction::Compare( const MetaAction& rMetaAction ) const { return meRasterOp == ((MetaRasterOpAction&)rMetaAction).meRasterOp; } - - void MetaRasterOpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); rOStm.WriteUInt16( (sal_uInt16) meRasterOp ); } - - void MetaRasterOpAction::Read( SvStream& rIStm, ImplMetaReadData* ) { sal_uInt16 nTmp16(0); @@ -3720,12 +2900,8 @@ void MetaRasterOpAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadUInt16( nTmp16 ); meRasterOp = (RasterOp) nTmp16; } - - IMPL_META_ACTION( Transparent, META_TRANSPARENT_ACTION ) - - MetaTransparentAction::MetaTransparentAction( const PolyPolygon& rPolyPoly, sal_uInt16 nTransPercent ) : MetaAction ( META_TRANSPARENT_ACTION ), maPolyPoly ( rPolyPoly ), @@ -3733,15 +2909,11 @@ MetaTransparentAction::MetaTransparentAction( const PolyPolygon& rPolyPoly, sal_ { } - - void MetaTransparentAction::Execute( OutputDevice* pOut ) { pOut->DrawTransparent( maPolyPoly, mnTransPercent ); } - - MetaAction* MetaTransparentAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTransparentAction( *this ); @@ -3749,31 +2921,23 @@ MetaAction* MetaTransparentAction::Clone() return pClone; } - - void MetaTransparentAction::Move( long nHorzMove, long nVertMove ) { maPolyPoly.Move( nHorzMove, nVertMove ); } - - void MetaTransparentAction::Scale( double fScaleX, double fScaleY ) { for( sal_uInt16 i = 0, nCount = maPolyPoly.Count(); i < nCount; i++ ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } - - bool MetaTransparentAction::Compare( const MetaAction& rMetaAction ) const { return ( maPolyPoly == ((MetaTransparentAction&)rMetaAction).maPolyPoly ) && ( mnTransPercent == ((MetaTransparentAction&)rMetaAction).mnTransPercent ); } - - void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3794,8 +2958,6 @@ void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUInt16( mnTransPercent ); } - - void MetaTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3803,12 +2965,8 @@ void MetaTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadUInt16( mnTransPercent ); } - - IMPL_META_ACTION( FloatTransparent, META_FLOATTRANSPARENT_ACTION ) - - MetaFloatTransparentAction::MetaFloatTransparentAction( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize, const Gradient& rGradient ) : MetaAction ( META_FLOATTRANSPARENT_ACTION ), @@ -3819,15 +2977,11 @@ MetaFloatTransparentAction::MetaFloatTransparentAction( const GDIMetaFile& rMtf, { } - - void MetaFloatTransparentAction::Execute( OutputDevice* pOut ) { pOut->DrawTransparent( maMtf, maPoint, maSize, maGradient ); } - - MetaAction* MetaFloatTransparentAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaFloatTransparentAction( *this ); @@ -3835,15 +2989,11 @@ MetaAction* MetaFloatTransparentAction::Clone() return pClone; } - - void MetaFloatTransparentAction::Move( long nHorzMove, long nVertMove ) { maPoint.Move( nHorzMove, nVertMove ); } - - void MetaFloatTransparentAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maPoint, maSize); @@ -3852,8 +3002,6 @@ void MetaFloatTransparentAction::Scale( double fScaleX, double fScaleY ) maSize = aRectangle.GetSize(); } - - bool MetaFloatTransparentAction::Compare( const MetaAction& rMetaAction ) const { return ( maMtf == ((MetaFloatTransparentAction&)rMetaAction).maMtf ) && @@ -3862,8 +3010,6 @@ bool MetaFloatTransparentAction::Compare( const MetaAction& rMetaAction ) const ( maGradient == ((MetaFloatTransparentAction&)rMetaAction).maGradient ); } - - void MetaFloatTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3874,8 +3020,6 @@ void MetaFloatTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pDat WriteGradient( rOStm, maGradient ); } - - void MetaFloatTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3885,12 +3029,8 @@ void MetaFloatTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadGradient( rIStm, maGradient ); } - - IMPL_META_ACTION( EPS, META_EPS_ACTION ) - - MetaEPSAction::MetaEPSAction( const Point& rPoint, const Size& rSize, const GfxLink& rGfxLink, const GDIMetaFile& rSubst ) : MetaAction ( META_EPS_ACTION ), @@ -3901,15 +3041,11 @@ MetaEPSAction::MetaEPSAction( const Point& rPoint, const Size& rSize, { } - - void MetaEPSAction::Execute( OutputDevice* pOut ) { pOut->DrawEPS( maPoint, maSize, maGfxLink, &maSubst ); } - - MetaAction* MetaEPSAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaEPSAction( *this ); @@ -3917,15 +3053,11 @@ MetaAction* MetaEPSAction::Clone() return pClone; } - - void MetaEPSAction::Move( long nHorzMove, long nVertMove ) { maPoint.Move( nHorzMove, nVertMove ); } - - void MetaEPSAction::Scale( double fScaleX, double fScaleY ) { Rectangle aRectangle(maPoint, maSize); @@ -3934,8 +3066,6 @@ void MetaEPSAction::Scale( double fScaleX, double fScaleY ) maSize = aRectangle.GetSize(); } - - bool MetaEPSAction::Compare( const MetaAction& rMetaAction ) const { return ( maGfxLink.IsEqual(((MetaEPSAction&)rMetaAction).maGfxLink )) && @@ -3944,8 +3074,6 @@ bool MetaEPSAction::Compare( const MetaAction& rMetaAction ) const ( maSize == ((MetaEPSAction&)rMetaAction).maSize ); } - - void MetaEPSAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -3955,8 +3083,6 @@ void MetaEPSAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) maSubst.Write( rOStm ); } - - void MetaEPSAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -3966,12 +3092,8 @@ void MetaEPSAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadGDIMetaFile( rIStm, maSubst ); } - - IMPL_META_ACTION( RefPoint, META_REFPOINT_ACTION ) - - MetaRefPointAction::MetaRefPointAction( const Point& rRefPoint, bool bSet ) : MetaAction ( META_REFPOINT_ACTION ), maRefPoint ( rRefPoint ), @@ -3979,8 +3101,6 @@ MetaRefPointAction::MetaRefPointAction( const Point& rRefPoint, bool bSet ) : { } - - void MetaRefPointAction::Execute( OutputDevice* pOut ) { if( mbSet ) @@ -3989,8 +3109,6 @@ void MetaRefPointAction::Execute( OutputDevice* pOut ) pOut->SetRefPoint(); } - - MetaAction* MetaRefPointAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaRefPointAction( *this ); @@ -3998,16 +3116,12 @@ MetaAction* MetaRefPointAction::Clone() return pClone; } - - bool MetaRefPointAction::Compare( const MetaAction& rMetaAction ) const { return ( maRefPoint == ((MetaRefPointAction&)rMetaAction).maRefPoint ) && ( mbSet == ((MetaRefPointAction&)rMetaAction).mbSet ); } - - void MetaRefPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -4015,16 +3129,12 @@ void MetaRefPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } - - void MetaRefPointAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadPair( rIStm, maRefPoint ).ReadCharAsBool( mbSet ); } - - MetaCommentAction::MetaCommentAction( sal_Int32 nValue ) : MetaAction ( META_COMMENT_ACTION ), mnValue ( nValue ) @@ -4032,8 +3142,6 @@ MetaCommentAction::MetaCommentAction( sal_Int32 nValue ) : ImplInitDynamicData( NULL, 0UL ); } - - MetaCommentAction::MetaCommentAction( const MetaCommentAction& rAct ) : MetaAction ( META_COMMENT_ACTION ), maComment ( rAct.maComment ), @@ -4042,8 +3150,6 @@ MetaCommentAction::MetaCommentAction( const MetaCommentAction& rAct ) : ImplInitDynamicData( rAct.mpData, rAct.mnDataSize ); } - - MetaCommentAction::MetaCommentAction( const OString& rComment, sal_Int32 nValue, const sal_uInt8* pData, sal_uInt32 nDataSize ) : MetaAction ( META_COMMENT_ACTION ), maComment ( rComment ), @@ -4052,16 +3158,12 @@ MetaCommentAction::MetaCommentAction( const OString& rComment, sal_Int32 nValue, ImplInitDynamicData( pData, nDataSize ); } - - MetaCommentAction::~MetaCommentAction() { if ( mpData ) delete[] mpData; } - - void MetaCommentAction::ImplInitDynamicData( const sal_uInt8* pData, sal_uInt32 nDataSize ) { if ( nDataSize && pData ) @@ -4076,8 +3178,6 @@ void MetaCommentAction::ImplInitDynamicData( const sal_uInt8* pData, sal_uInt32 } } - - void MetaCommentAction::Execute( OutputDevice* pOut ) { if ( pOut->GetConnectMetaFile() ) @@ -4087,8 +3187,6 @@ void MetaCommentAction::Execute( OutputDevice* pOut ) } } - - MetaAction* MetaCommentAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaCommentAction( *this ); @@ -4148,7 +3246,6 @@ void MetaCommentAction::Move( long nXMove, long nYMove ) } } - // SJ: 25.07.06 #i56656# we are not able to mirrorcertain kind of // comments properly, especially the XPATHSTROKE and XPATHFILL lead to // problems, so it is better to remove these comments when mirroring @@ -4214,8 +3311,6 @@ void MetaCommentAction::Scale( double fXScale, double fYScale ) } } - - bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const { return ( maComment == ((MetaCommentAction&)rMetaAction).maComment ) && @@ -4224,8 +3319,6 @@ bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const ( memcmp( mpData, ((MetaCommentAction&)rMetaAction).mpData, mnDataSize ) == 0 ); } - - void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); @@ -4236,8 +3329,6 @@ void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.Write( mpData, mnDataSize ); } - - void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); @@ -4257,27 +3348,19 @@ void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* ) mpData = NULL; } - - IMPL_META_ACTION( LayoutMode, META_LAYOUTMODE_ACTION ) - - MetaLayoutModeAction::MetaLayoutModeAction( sal_uInt32 nLayoutMode ) : MetaAction ( META_LAYOUTMODE_ACTION ), mnLayoutMode( nLayoutMode ) { } - - void MetaLayoutModeAction::Execute( OutputDevice* pOut ) { pOut->SetLayoutMode( mnLayoutMode ); } - - MetaAction* MetaLayoutModeAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaLayoutModeAction( *this ); @@ -4285,50 +3368,36 @@ MetaAction* MetaLayoutModeAction::Clone() return pClone; } - - bool MetaLayoutModeAction::Compare( const MetaAction& rMetaAction ) const { return mnLayoutMode == ((MetaLayoutModeAction&)rMetaAction).mnLayoutMode; } - - void MetaLayoutModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); rOStm.WriteUInt32( mnLayoutMode ); } - - void MetaLayoutModeAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); rIStm.ReadUInt32( mnLayoutMode ); } - - IMPL_META_ACTION( TextLanguage, META_TEXTLANGUAGE_ACTION ) - - MetaTextLanguageAction::MetaTextLanguageAction( LanguageType eTextLanguage ) : MetaAction ( META_TEXTLANGUAGE_ACTION ), meTextLanguage( eTextLanguage ) { } - - void MetaTextLanguageAction::Execute( OutputDevice* pOut ) { pOut->SetDigitLanguage( meTextLanguage ); } - - MetaAction* MetaTextLanguageAction::Clone() { MetaAction* pClone = (MetaAction*) new MetaTextLanguageAction( *this ); @@ -4336,23 +3405,17 @@ MetaAction* MetaTextLanguageAction::Clone() return pClone; } - - bool MetaTextLanguageAction::Compare( const MetaAction& rMetaAction ) const { return meTextLanguage == ((MetaTextLanguageAction&)rMetaAction).meTextLanguage; } - - void MetaTextLanguageAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); rOStm.WriteUInt16( meTextLanguage ); } - - void MetaTextLanguageAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx index b1b0e8b568ac..f4b786c044b9 100644 --- a/vcl/source/gdi/metric.cxx +++ b/vcl/source/gdi/metric.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <impfont.hxx> #include <vcl/metric.hxx> @@ -26,8 +25,6 @@ #include <cstdio> - - ImplFontMetric::ImplFontMetric() : mnAscent( 0 ), mnDescent( 0 ), @@ -39,16 +36,12 @@ ImplFontMetric::ImplFontMetric() mnRefCount( 1 ) {} - - inline void ImplFontMetric::AddReference() { // TODO: disable refcounting on the default maps? ++mnRefCount; } - - inline void ImplFontMetric::DeReference() { // TODO: disable refcounting on the default maps? @@ -56,8 +49,6 @@ inline void ImplFontMetric::DeReference() delete this; } - - bool ImplFontMetric::operator==( const ImplFontMetric& r ) const { if( mnMiscFlags != r.mnMiscFlags ) @@ -76,14 +67,10 @@ bool ImplFontMetric::operator==( const ImplFontMetric& r ) const return true; } - - FontInfo::FontInfo() : mpImplMetric( new ImplFontMetric ) {} - - FontInfo::FontInfo( const FontInfo& rInfo ) : Font( rInfo ) { @@ -91,15 +78,11 @@ FontInfo::FontInfo( const FontInfo& rInfo ) mpImplMetric->AddReference(); } - - FontInfo::~FontInfo() { mpImplMetric->DeReference(); } - - FontInfo& FontInfo::operator=( const FontInfo& rInfo ) { Font::operator=( rInfo ); @@ -114,8 +97,6 @@ FontInfo& FontInfo::operator=( const FontInfo& rInfo ) return *this; } - - bool FontInfo::operator==( const FontInfo& rInfo ) const { if( !Font::operator==( rInfo ) ) @@ -127,8 +108,6 @@ bool FontInfo::operator==( const FontInfo& rInfo ) const return false; } - - FontType FontInfo::GetType() const { return (mpImplMetric->IsScalable() ? TYPE_SCALABLE : TYPE_RASTER); @@ -138,63 +117,45 @@ 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 ) { FontInfo::operator=( 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/octree.cxx b/vcl/source/gdi/octree.cxx index 4e7222cdb2f5..21c0a4265e90 100644 --- a/vcl/source/gdi/octree.cxx +++ b/vcl/source/gdi/octree.cxx @@ -25,16 +25,12 @@ #include "octree.hxx" - // - pMask - - static const sal_uInt8 pImplMask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; - // - NodeCache - - ImpNodeCache::ImpNodeCache( const sal_uLong nInitSize ) : pActNode( NULL ) { @@ -49,8 +45,6 @@ ImpNodeCache::ImpNodeCache( const sal_uLong nInitSize ) : } } - - ImpNodeCache::~ImpNodeCache() { while( pActNode ) @@ -62,10 +56,8 @@ ImpNodeCache::~ImpNodeCache() } } - // - Octree - - Octree::Octree( const BitmapReadAccess& rReadAcc, sal_uLong nColors ) : nMax ( nColors ), nLeafCount ( 0L ), @@ -77,16 +69,12 @@ Octree::Octree( const BitmapReadAccess& rReadAcc, sal_uLong nColors ) : ImplCreateOctree(); } - - Octree::~Octree() { ImplDeleteOctree( &pTree ); delete pNodeCache; } - - void Octree::ImplCreateOctree() { if( !!*pAcc ) @@ -131,8 +119,6 @@ void Octree::ImplCreateOctree() } } - - void Octree::ImplDeleteOctree( PPNODE ppNode ) { for ( sal_uLong i = 0UL; i < 8UL; i++ ) @@ -145,8 +131,6 @@ void Octree::ImplDeleteOctree( PPNODE ppNode ) *ppNode = NULL; } - - void Octree::ImplAdd( PPNODE ppNode ) { // ggf. neuen Knoten erzeugen @@ -184,8 +168,6 @@ void Octree::ImplAdd( PPNODE ppNode ) } } - - void Octree::ImplReduce() { sal_uLong i; @@ -224,8 +206,6 @@ void Octree::ImplReduce() nLeafCount -= --nChildren; } - - void Octree::CreatePalette( PNODE pNode ) { if( pNode->bLeaf ) @@ -241,8 +221,6 @@ void Octree::CreatePalette( PNODE pNode ) } - - void Octree::GetPalIndex( PNODE pNode ) { if ( pNode->bLeaf ) @@ -259,10 +237,8 @@ void Octree::GetPalIndex( PNODE pNode ) } } - // - InverseColorMap - - InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) : nBits( 8 - OCTREE_BITS ) { @@ -315,16 +291,12 @@ InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) : } } - - InverseColorMap::~InverseColorMap() { rtl_freeMemory( pBuffer ); rtl_freeMemory( pMap ); } - - void InverseColorMap::ImplCreateBuffers( const sal_uLong nMax ) { const sal_uLong nCount = nMax * nMax * nMax; diff --git a/vcl/source/gdi/oldprintadaptor.cxx b/vcl/source/gdi/oldprintadaptor.cxx index 9ac3839b9238..3270f75bcdfe 100644 --- a/vcl/source/gdi/oldprintadaptor.cxx +++ b/vcl/source/gdi/oldprintadaptor.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/oldprintadaptor.hxx" #include "vcl/gdimtf.hxx" diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx index 2b7a088d0d6c..1ee437b962dc 100644 --- a/vcl/source/gdi/outdev.cxx +++ b/vcl/source/gdi/outdev.cxx @@ -955,7 +955,6 @@ Color OutputDevice::ImplDrawModeToColor( const Color& rColor ) const return aColor; } - void OutputDevice::SetLineColor( const Color& rColor ) { diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 6e22bd3ad52d..c2825d89bc6b 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -95,8 +95,6 @@ #include <memory> #include <algorithm> - - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::rtl; @@ -645,7 +643,6 @@ Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang, return aFont; } - ImplFontEntry::ImplFontEntry( const FontSelectPattern& rFontSelData ) : maFontSelData( rFontSelData ) , maMetric( rFontSelData ) @@ -704,7 +701,6 @@ void ImplFontEntry::IgnoreFallbackForUnicode( sal_UCS4 cChar, FontWeight eWeight mpUnicodeFallbackList->erase( it ); } - FontSelectPatternAttributes::FontSelectPatternAttributes( const Font& rFont, const OUString& rSearchName, const Size& rSize, float fExactHeight ) : maSearchName( rSearchName ) @@ -1120,7 +1116,6 @@ ImplMultiTextLineInfo::ImplMultiTextLineInfo() mnSize = MULTITEXTLINEINFO_RESIZE; } - ImplMultiTextLineInfo::~ImplMultiTextLineInfo() { for( sal_Int32 i = 0; i < mnLines; i++ ) @@ -3749,7 +3744,6 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr, pDisplayText = &mpOutDevData->mpRecordLayout->m_aDisplayText; } - #if OSL_DEBUG_LEVEL > 2 fprintf( stderr, " OutputDevice::DrawText(\"%s\")\n", OUStringToOString( rStr, RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -4606,7 +4600,6 @@ void OutputDevice::ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& r aPos.X() = rRect.Left(); } - // If there still is a last line, we output it left-aligned as the line would be clipped if ( !aLastLine.isEmpty() ) _rLayout.DrawText( aPos, aLastLine, 0, aLastLine.getLength(), pVector, pDisplayText ); @@ -4744,7 +4737,6 @@ void OutputDevice::DrawText( const Rectangle& rRect, const OUString& rOrigStr, s pDisplayText = &mpOutDevData->mpRecordLayout->m_aDisplayText; } - bool bDecomposeTextRectAction = ( _pTextLayout != NULL ) && _pTextLayout->DecomposeTextRectAction(); if ( mpMetaFile && !bDecomposeTextRectAction ) mpMetaFile->AddAction( new MetaTextRectAction( rRect, rOrigStr, nStyle ) ); @@ -5963,7 +5955,6 @@ bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector, } } - // ignore "empty" glyphs: if( aPolyPoly.Count() > 0 ) { diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx index 0810e6b32f66..a8dc07d1a65e 100644 --- a/vcl/source/gdi/outdev4.cxx +++ b/vcl/source/gdi/outdev4.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/debug.hxx> #include <tools/line.hxx> #include <tools/poly.hxx> @@ -59,7 +58,6 @@ extern "C" int SAL_CALL ImplHatchCmpFnc( const void* p1, const void* p2 ) return ( nX1 > nX2 ? 1 : nX1 == nX2 ? nY1 > nY2 ? 1: nY1 == nY2 ? 0 : -1 : -1 ); } - void OutputDevice::ImplDrawPolygon( const Polygon& rPoly, const PolyPolygon* pClipPolyPoly ) { if( pClipPolyPoly ) diff --git a/vcl/source/gdi/outdev5.cxx b/vcl/source/gdi/outdev5.cxx index 5e6fa7f8fa3b..f16beae8ad95 100644 --- a/vcl/source/gdi/outdev5.cxx +++ b/vcl/source/gdi/outdev5.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/debug.hxx> #include <tools/poly.hxx> @@ -31,11 +30,6 @@ #include <outdata.hxx> #include <outdev.h> - - - - - void OutputDevice::DrawRect( const Rectangle& rRect, sal_uLong nHorzRound, sal_uLong nVertRound ) { @@ -92,8 +86,6 @@ void OutputDevice::DrawRect( const Rectangle& rRect, mpAlphaVDev->DrawRect( rRect, nHorzRound, nVertRound ); } - - void OutputDevice::DrawEllipse( const Rectangle& rRect ) { @@ -140,8 +132,6 @@ void OutputDevice::DrawEllipse( const Rectangle& rRect ) mpAlphaVDev->DrawEllipse( rRect ); } - - void OutputDevice::DrawArc( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ) { @@ -185,8 +175,6 @@ void OutputDevice::DrawArc( const Rectangle& rRect, mpAlphaVDev->DrawArc( rRect, rStartPt, rEndPt ); } - - void OutputDevice::DrawPie( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ) { @@ -237,8 +225,6 @@ void OutputDevice::DrawPie( const Rectangle& rRect, mpAlphaVDev->DrawPie( rRect, rStartPt, rEndPt ); } - - void OutputDevice::DrawChord( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ) { diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx index ea606450fea3..49a51bf2000c 100644 --- a/vcl/source/gdi/outdev6.cxx +++ b/vcl/source/gdi/outdev6.cxx @@ -176,7 +176,6 @@ void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLon mpAlphaVDev->DrawGrid( rRect, rDist, nFlags ); } - // Caution: This method is nearly the same as // void OutputDevice::DrawPolyPolygon( const basegfx::B2DPolyPolygon& rB2DPolyPoly ) // so when changes are made here do not forget to make changes there, too @@ -593,8 +592,6 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly, } } - - void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize, const Gradient& rTransparenceGradient ) { @@ -746,8 +743,6 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, } } - - void OutputDevice::ImplDrawColorWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ) @@ -765,8 +760,6 @@ void OutputDevice::ImplDrawColorWallpaper( long nX, long nY, EnableMapMode( bMap ); } - - void OutputDevice::ImplDrawBitmapWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ) @@ -1008,8 +1001,6 @@ void OutputDevice::ImplDrawBitmapWallpaper( long nX, long nY, mpMetaFile = pOldMetaFile; } - - void OutputDevice::ImplDrawGradientWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ) @@ -1053,8 +1044,6 @@ void OutputDevice::ImplDrawGradientWallpaper( long nX, long nY, mpMetaFile = pOldMetaFile; } - - void OutputDevice::ImplDrawWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ) @@ -1067,8 +1056,6 @@ void OutputDevice::ImplDrawWallpaper( long nX, long nY, ImplDrawColorWallpaper( nX, nY, nWidth, nHeight, rWallpaper ); } - - void OutputDevice::DrawWallpaper( const Rectangle& rRect, const Wallpaper& rWallpaper ) { @@ -1094,8 +1081,6 @@ void OutputDevice::DrawWallpaper( const Rectangle& rRect, mpAlphaVDev->DrawWallpaper( rRect, rWallpaper ); } - - void OutputDevice::Erase() { if ( !IsDeviceOutputNecessary() || ImplIsRecordLayout() ) @@ -1134,8 +1119,6 @@ void OutputDevice::Erase() mpAlphaVDev->Erase(); } - - bool OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize, const GfxLink& rGfxLink, GDIMetaFile* pSubst ) { @@ -1192,8 +1175,6 @@ bool OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize, return bDrawn; } - - void OutputDevice::DrawCheckered(const Point& rPos, const Size& rSize, sal_uInt32 nLen, Color aStart, Color aEnd) { const sal_uInt32 nMaxX(rPos.X() + rSize.Width()); diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx index bef50d8d4ec1..e521ae7524a8 100644 --- a/vcl/source/gdi/outdevnative.cxx +++ b/vcl/source/gdi/outdevnative.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/outdev.hxx" #include "vcl/window.hxx" #include "vcl/salnativewidgets.hxx" @@ -25,8 +24,6 @@ #include "salgdi.hxx" - - static bool lcl_enableNativeWidget( const OutputDevice& i_rDevice ) { const OutDevType eType( i_rDevice.GetOutDevType() ); @@ -140,13 +137,9 @@ PushButtonValue* PushButtonValue::clone() const return new PushButtonValue( *this ); } - // These functions are mainly passthrough functions that allow access to // the SalFrame behind a Window object for native widget rendering purposes. - - - bool OutputDevice::IsNativeControlSupported( ControlType nType, ControlPart nPart ) const { if( !lcl_enableNativeWidget( *this ) ) @@ -159,9 +152,6 @@ bool OutputDevice::IsNativeControlSupported( ControlType nType, ControlPart nPar return( mpGraphics->IsNativeControlSupported(nType, nPart) ); } - - - bool OutputDevice::HitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, @@ -183,8 +173,6 @@ bool OutputDevice::HitTestNativeControl( ControlType nType, rIsInside, this ) ); } - - static boost::shared_ptr< ImplControlValue > lcl_transformControlValue( const ImplControlValue& rVal, const OutputDevice& rDev ) { boost::shared_ptr< ImplControlValue > aResult; @@ -303,8 +291,6 @@ bool OutputDevice::DrawNativeControl( ControlType nType, return bRet; } - - bool OutputDevice::GetNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, @@ -339,5 +325,4 @@ bool OutputDevice::GetNativeControlRegion( ControlType nType, return bRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx index 57146b4ed212..1d5ffdbe9b90 100644 --- a/vcl/source/gdi/outmap.cxx +++ b/vcl/source/gdi/outmap.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <limits.h> #include <tools/bigint.hxx> @@ -42,19 +41,12 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> - - - - - static int const s_ImplArySize = MAP_PIXEL+1; static const long aImplNumeratorAry[s_ImplArySize] = { 1, 1, 5, 50, 1, 1, 1, 1, 1, 1, 1 }; 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 ctor fraction once); we could also do this with BigInts @@ -97,8 +89,6 @@ static Fraction ImplMakeFraction( long nN1, long nN2, long nD1, long nD2 ) return aF; } - - // Fraction.GetNumerator() // Fraction.GetDenominator() > 0 // rOutRes.nPixPerInch? > 0 @@ -165,8 +155,6 @@ static void ImplCalcBigIntThreshold( long nDPIX, long nDPIY, rThresRes.mnThresPixToLogY /= 2; } - - static void ImplCalcMapResolution( const MapMode& rMapMode, long nDPIX, long nDPIY, ImplMapRes& rMapRes ) { @@ -348,8 +336,6 @@ static void ImplCalcMapResolution( const MapMode& rMapMode, } } - - inline void ImplCalcMapResolution( const MapMode& rMapMode, long nDPIX, long nDPIY, ImplMapRes& rMapRes, @@ -359,8 +345,6 @@ 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,8 +379,6 @@ 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,8 +399,6 @@ static long ImplPixelToLogic( long n, long nDPI, long nMapNum, long nMapDenom, return (n / 2); } - - long OutputDevice::ImplLogicXToDevicePixel( long nX ) const { if ( !mbMap ) @@ -429,8 +409,6 @@ long OutputDevice::ImplLogicXToDevicePixel( long nX ) const maThresRes.mnThresLogToPixX )+mnOutOffX+mnOutOffOrigX; } - - long OutputDevice::ImplLogicYToDevicePixel( long nY ) const { if ( !mbMap ) @@ -441,8 +419,6 @@ long OutputDevice::ImplLogicYToDevicePixel( long nY ) const maThresRes.mnThresLogToPixY )+mnOutOffY+mnOutOffOrigY; } - - long OutputDevice::ImplLogicWidthToDevicePixel( long nWidth ) const { if ( !mbMap ) @@ -453,8 +429,6 @@ long OutputDevice::ImplLogicWidthToDevicePixel( long nWidth ) const maThresRes.mnThresLogToPixX ); } - - long OutputDevice::ImplLogicHeightToDevicePixel( long nHeight ) const { if ( !mbMap ) @@ -473,8 +447,6 @@ float OutputDevice::ImplFloatLogicHeightToDevicePixel( float fLogicHeight) const return fPixelHeight; } - - long OutputDevice::ImplDevicePixelToLogicWidth( long nWidth ) const { if ( !mbMap ) @@ -485,8 +457,6 @@ long OutputDevice::ImplDevicePixelToLogicWidth( long nWidth ) const maThresRes.mnThresPixToLogX ); } - - long OutputDevice::ImplDevicePixelToLogicHeight( long nHeight ) const { if ( !mbMap ) @@ -497,8 +467,6 @@ long OutputDevice::ImplDevicePixelToLogicHeight( long nHeight ) const maThresRes.mnThresPixToLogY ); } - - Point OutputDevice::ImplLogicToDevicePixel( const Point& rLogicPt ) const { if ( !mbMap ) @@ -512,8 +480,6 @@ Point OutputDevice::ImplLogicToDevicePixel( const Point& rLogicPt ) const maThresRes.mnThresLogToPixY )+mnOutOffY+mnOutOffOrigY ); } - - Size OutputDevice::ImplLogicToDevicePixel( const Size& rLogicSize ) const { if ( !mbMap ) @@ -527,8 +493,6 @@ Size OutputDevice::ImplLogicToDevicePixel( const Size& rLogicSize ) const maThresRes.mnThresLogToPixY ) ); } - - Rectangle OutputDevice::ImplLogicToDevicePixel( const Rectangle& rLogicRect ) const { if ( rLogicRect.IsEmpty() ) @@ -554,8 +518,6 @@ Rectangle OutputDevice::ImplLogicToDevicePixel( const Rectangle& rLogicRect ) co maThresRes.mnThresLogToPixY )+mnOutOffY+mnOutOffOrigY ); } - - Polygon OutputDevice::ImplLogicToDevicePixel( const Polygon& rLogicPoly ) const { if ( !mbMap && !mnOutOffX && !mnOutOffY ) @@ -597,8 +559,6 @@ Polygon OutputDevice::ImplLogicToDevicePixel( const Polygon& rLogicPoly ) const return aPoly; } - - PolyPolygon OutputDevice::ImplLogicToDevicePixel( const PolyPolygon& rLogicPolyPoly ) const { if ( !mbMap && !mnOutOffX && !mnOutOffY ) @@ -614,8 +574,6 @@ PolyPolygon OutputDevice::ImplLogicToDevicePixel( const PolyPolygon& rLogicPolyP return aPolyPoly; } - - LineInfo OutputDevice::ImplLogicToDevicePixel( const LineInfo& rLineInfo ) const { LineInfo aInfo( rLineInfo ); @@ -643,8 +601,6 @@ LineInfo OutputDevice::ImplLogicToDevicePixel( const LineInfo& rLineInfo ) const return aInfo; } - - Rectangle OutputDevice::ImplDevicePixelToLogic( const Rectangle& rPixelRect ) const { if ( rPixelRect.IsEmpty() ) @@ -670,8 +626,6 @@ Rectangle OutputDevice::ImplDevicePixelToLogic( const Rectangle& rPixelRect ) co maThresRes.mnThresPixToLogY )-maMapRes.mnMapOfsY ); } - - Region OutputDevice::ImplPixelToDevicePixel( const Region& rRegion ) const { if ( !mnOutOffX && !mnOutOffY ) @@ -682,8 +636,6 @@ Region OutputDevice::ImplPixelToDevicePixel( const Region& rRegion ) const return aRegion; } - - void OutputDevice::EnableMapMode( bool bEnable ) { mbMap = bEnable; @@ -692,8 +644,6 @@ void OutputDevice::EnableMapMode( bool bEnable ) mpAlphaVDev->EnableMapMode( bEnable ); } - - void OutputDevice::SetMapMode() { @@ -726,8 +676,6 @@ void OutputDevice::SetMapMode() mpAlphaVDev->SetMapMode(); } - - void OutputDevice::SetMapMode( const MapMode& rNewMapMode ) { @@ -826,8 +774,6 @@ void OutputDevice::SetMapMode( const MapMode& rNewMapMode ) ImplInvalidateViewTransform(); } - - void OutputDevice::SetRelativeMapMode( const MapMode& rNewMapMode ) { // do nothing if MapMode did not change @@ -899,8 +845,6 @@ void OutputDevice::SetRelativeMapMode( const MapMode& rNewMapMode ) mpAlphaVDev->SetRelativeMapMode( rNewMapMode ); } - - // #i75163# basegfx::B2DHomMatrix OutputDevice::GetViewTransformation() const { @@ -935,8 +879,6 @@ basegfx::B2DHomMatrix OutputDevice::GetViewTransformation() const } } - - // #i75163# basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation() const { @@ -963,8 +905,6 @@ basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation() const } } - - // #i75163# basegfx::B2DHomMatrix OutputDevice::GetViewTransformation( const MapMode& rMapMode ) const { @@ -988,8 +928,6 @@ basegfx::B2DHomMatrix OutputDevice::GetViewTransformation( const MapMode& rMapMo return aTransform; } - - // #i75163# basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation( const MapMode& rMapMode ) const { @@ -998,8 +936,6 @@ basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation( const MapMode& return aMatrix; } - - basegfx::B2DHomMatrix OutputDevice::ImplGetDeviceTransformation() const { basegfx::B2DHomMatrix aTransformation = GetViewTransformation(); @@ -1009,8 +945,6 @@ basegfx::B2DHomMatrix OutputDevice::ImplGetDeviceTransformation() const return aTransformation; } - - Point OutputDevice::LogicToPixel( const Point& rLogicPt ) const { @@ -1025,8 +959,6 @@ Point OutputDevice::LogicToPixel( const Point& rLogicPt ) const maThresRes.mnThresLogToPixY )+mnOutOffOrigY ); } - - Size OutputDevice::LogicToPixel( const Size& rLogicSize ) const { @@ -1041,8 +973,6 @@ Size OutputDevice::LogicToPixel( const Size& rLogicSize ) const maThresRes.mnThresLogToPixY ) ); } - - Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect ) const { @@ -1063,8 +993,6 @@ Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect ) const maThresRes.mnThresLogToPixY )+mnOutOffOrigY ); } - - Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly ) const { @@ -1094,8 +1022,6 @@ Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly ) const return aPoly; } - - PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly ) const { @@ -1112,8 +1038,6 @@ PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly ) cons return aPolyPoly; } - - basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogicPoly ) const { basegfx::B2DPolygon aTransformedPoly = rLogicPoly; @@ -1122,8 +1046,6 @@ basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogi return aTransformedPoly; } - - basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly ) const { basegfx::B2DPolyPolygon aTransformedPoly = rLogicPolyPoly; @@ -1132,8 +1054,6 @@ basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygo return aTransformedPoly; } - - Region OutputDevice::LogicToPixel( const Region& rLogicRegion ) const { @@ -1168,8 +1088,6 @@ Region OutputDevice::LogicToPixel( const Region& rLogicRegion ) const return aRegion; } - - Point OutputDevice::LogicToPixel( const Point& rLogicPt, const MapMode& rMapMode ) const { @@ -1190,8 +1108,6 @@ Point OutputDevice::LogicToPixel( const Point& rLogicPt, aThresRes.mnThresLogToPixY )+mnOutOffOrigY ); } - - Size OutputDevice::LogicToPixel( const Size& rLogicSize, const MapMode& rMapMode ) const { @@ -1212,8 +1128,6 @@ Size OutputDevice::LogicToPixel( const Size& rLogicSize, aThresRes.mnThresLogToPixY ) ); } - - Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect, const MapMode& rMapMode ) const { @@ -1240,8 +1154,6 @@ Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect, aThresRes.mnThresLogToPixY )+mnOutOffOrigY ); } - - Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly, const MapMode& rMapMode ) const { @@ -1277,8 +1189,6 @@ Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly, return aPoly; } - - PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly, const MapMode& rMapMode ) const { @@ -1296,8 +1206,6 @@ PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly, return aPolyPoly; } - - basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly, const MapMode& rMapMode ) const { @@ -1307,8 +1215,6 @@ basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygo return aTransformedPoly; } - - basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogicPoly, const MapMode& rMapMode ) const { @@ -1318,8 +1224,6 @@ basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogi return aTransformedPoly; } - - Region OutputDevice::LogicToPixel( const Region& rLogicRegion, const MapMode& rMapMode ) const { @@ -1354,8 +1258,6 @@ Region OutputDevice::LogicToPixel( const Region& rLogicRegion, const MapMode& rM return aRegion; } - - Point OutputDevice::PixelToLogic( const Point& rDevicePt ) const { @@ -1370,8 +1272,6 @@ Point OutputDevice::PixelToLogic( const Point& rDevicePt ) const maThresRes.mnThresPixToLogY ) - maMapRes.mnMapOfsY - mnOutOffLogicY ); } - - Size OutputDevice::PixelToLogic( const Size& rDeviceSize ) const { @@ -1386,8 +1286,6 @@ Size OutputDevice::PixelToLogic( const Size& rDeviceSize ) const maThresRes.mnThresPixToLogY ) ); } - - Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect ) const { @@ -1408,8 +1306,6 @@ Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect ) const maThresRes.mnThresPixToLogY ) - maMapRes.mnMapOfsY - mnOutOffLogicY ); } - - Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly ) const { @@ -1439,8 +1335,6 @@ Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly ) const return aPoly; } - - PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly ) const { @@ -1465,8 +1359,6 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygo return aTransformedPoly; } - - Region OutputDevice::PixelToLogic( const Region& rDeviceRegion ) const { @@ -1501,8 +1393,6 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion ) const return aRegion; } - - Point OutputDevice::PixelToLogic( const Point& rDevicePt, const MapMode& rMapMode ) const { @@ -1524,8 +1414,6 @@ Point OutputDevice::PixelToLogic( const Point& rDevicePt, aThresRes.mnThresPixToLogY ) - aMapRes.mnMapOfsY - mnOutOffLogicY ); } - - Size OutputDevice::PixelToLogic( const Size& rDeviceSize, const MapMode& rMapMode ) const { @@ -1547,8 +1435,6 @@ Size OutputDevice::PixelToLogic( const Size& rDeviceSize, aThresRes.mnThresPixToLogY ) ); } - - Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect, const MapMode& rMapMode ) const { @@ -1576,8 +1462,6 @@ Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect, aThresRes.mnThresPixToLogY ) - aMapRes.mnMapOfsY - mnOutOffLogicY ); } - - Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly, const MapMode& rMapMode ) const { @@ -1614,8 +1498,6 @@ Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly, return aPoly; } - - PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly, const MapMode& rMapMode ) const { @@ -1633,8 +1515,6 @@ PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly, return aPolyPoly; } - - basegfx::B2DPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolygon& rPixelPoly, const MapMode& rMapMode ) const { @@ -1644,8 +1524,6 @@ basegfx::B2DPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolygon& rPixe return aTransformedPoly; } - - basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygon& rPixelPolyPoly, const MapMode& rMapMode ) const { @@ -1655,8 +1533,6 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygo return aTransformedPoly; } - - Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& rMapMode ) const { @@ -1691,8 +1567,6 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r return aRegion; } - - #define ENTER0( rSource, pMapModeSource, pMapModeDest ) \ if ( !pMapModeSource ) \ pMapModeSource = &maMapMode; \ @@ -1701,8 +1575,6 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r if ( *pMapModeSource == *pMapModeDest ) \ return rSource - - #define ENTER1( rSource, pMapModeSource, pMapModeDest ) \ ENTER0( rSource, pMapModeSource, pMapModeDest ); \ \ @@ -1734,8 +1606,6 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r else \ aMapResDest = maMapRes - - #define ENTER2( eUnitSource, eUnitDest ) \ DBG_ASSERT( eUnitSource != MAP_SYSFONT \ && eUnitSource != MAP_APPFONT \ @@ -1750,8 +1620,6 @@ 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; \ long nDenominator = 1; \ @@ -1769,8 +1637,6 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r else if( eUnitDest == MAP_PIXEL ) \ nNumerator *= 72 - - #define ENTER4( rMapModeSource, rMapModeDest ) \ ImplMapRes aMapResSource; \ aMapResSource.mnMapOfsX = 0; \ @@ -1784,8 +1650,6 @@ 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, const long n2, @@ -1904,8 +1768,6 @@ 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,8 +1803,6 @@ static long fn3( const long n1, const long n2, const long n3 ) } // of else } - - Point OutputDevice::LogicToLogic( const Point& rPtSource, const MapMode* pMapModeSource, const MapMode* pMapModeDest ) const @@ -1959,8 +1819,6 @@ Point OutputDevice::LogicToLogic( const Point& rPtSource, aMapResDest.mnMapOfsY ); } - - Size OutputDevice::LogicToLogic( const Size& rSzSource, const MapMode* pMapModeSource, const MapMode* pMapModeDest ) const @@ -1975,8 +1833,6 @@ Size OutputDevice::LogicToLogic( const Size& rSzSource, aMapResSource.mnMapScDenomY, aMapResDest.mnMapScNumY ) ); } - - Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource, const MapMode* pMapModeSource, const MapMode* pMapModeDest ) const @@ -2001,8 +1857,6 @@ Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource, aMapResDest.mnMapOfsY ); } - - Point OutputDevice::LogicToLogic( const Point& rPtSource, const MapMode& rMapModeSource, const MapMode& rMapModeDest ) @@ -2037,8 +1891,6 @@ Point OutputDevice::LogicToLogic( const Point& rPtSource, } } - - Size OutputDevice::LogicToLogic( const Size& rSzSource, const MapMode& rMapModeSource, const MapMode& rMapModeDest ) @@ -2071,8 +1923,6 @@ Size OutputDevice::LogicToLogic( const Size& rSzSource, } } - - basegfx::B2DPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolygon& rPolySource, const MapMode& rMapModeSource, const MapMode& rMapModeDest ) @@ -2089,8 +1939,6 @@ basegfx::B2DPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolygon& rPoly return aPoly; } - - basegfx::B2DPolyPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolyPolygon& rPolySource, const MapMode& rMapModeSource, const MapMode& rMapModeDest ) @@ -2107,8 +1955,6 @@ basegfx::B2DPolyPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolyPolygo return aPoly; } - - basegfx::B2DHomMatrix OutputDevice::LogicToLogic(const MapMode& rMapModeSource, const MapMode& rMapModeDest) { basegfx::B2DHomMatrix aTransform; @@ -2148,8 +1994,6 @@ basegfx::B2DHomMatrix OutputDevice::LogicToLogic(const MapMode& rMapModeSource, return aTransform; } - - Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource, const MapMode& rMapModeSource, const MapMode& rMapModeDest ) @@ -2194,8 +2038,6 @@ Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource, } } - - long OutputDevice::LogicToLogic( long nLongSource, MapUnit eUnitSource, MapUnit eUnitDest ) { @@ -2208,8 +2050,6 @@ long OutputDevice::LogicToLogic( long nLongSource, return fn3( nLongSource, nNumerator, nDenominator ); } - - void OutputDevice::SetPixelOffset( const Size& rOffset ) { mnOutOffOrigX = rOffset.Width(); @@ -2226,15 +2066,11 @@ void OutputDevice::SetPixelOffset( const Size& rOffset ) mpAlphaVDev->SetPixelOffset( rOffset ); } - - Size OutputDevice::GetPixelOffset() const { return Size(mnOutOffOrigX, mnOutOffOrigY); } - - long Window::ImplLogicUnitToPixelX( long nX, MapUnit eUnit ) { if ( eUnit != MAP_PIXEL ) @@ -2260,8 +2096,6 @@ long Window::ImplLogicUnitToPixelX( long nX, MapUnit eUnit ) return nX; } - - long Window::ImplLogicUnitToPixelY( long nY, MapUnit eUnit ) { if ( eUnit != MAP_PIXEL ) diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index 327c46bc6ba6..7a1f437f53f8 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -25,7 +25,6 @@ #include "basegfx/polygon/b2dpolygon.hxx" #include "basegfx/polygon/b2dpolygontools.hxx" - #include <boost/shared_ptr.hpp> #include <set> #include <map> diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx index de00ac33c87a..1249d6c0653c 100644 --- a/vcl/source/gdi/pdfwriter.cxx +++ b/vcl/source/gdi/pdfwriter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <pdfwriter_impl.hxx> #include <vcl/bitmapex.hxx> #include <vcl/image.hxx> diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 6646c7b994fe..c37f416b09cc 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -66,7 +66,6 @@ #include "pdfwriter_impl.hxx" - #if !defined(ANDROID) && !defined(IOS) // NSS header files for PDF signing support #include "nss.h" @@ -294,7 +293,6 @@ void doTestCode() BitmapEx aBmpEx( aImageBmp, AlphaMask( aTransMask ) ); aWriter.DrawBitmapEx( Point( 1500, 19500 ), Size( 4800, 3000 ), aBmpEx ); - aWriter.EndStructureElement(); aWriter.EndStructureElement(); @@ -3430,7 +3428,6 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const Physical endCompression(); disableStreamEncryption(); - sal_uInt64 nEndStreamPos = 0; osl_getFilePos( m_aFile, &nEndStreamPos ); @@ -4285,7 +4282,6 @@ bool PDFWriterImpl::appendDest( sal_Int32 nDestID, OStringBuffer& rBuffer ) return false; } - const PDFDest& rDest = m_aDests[ nDestID ]; const PDFPage& rDestPage = m_aPages[ rDest.m_nPage ]; @@ -7960,7 +7956,6 @@ void PDFWriterImpl::drawText( const Rectangle& rRect, const OUString& rOrigStr, aPos.X() = rRect.Left(); } - // output last line left adjusted since it was shortened if (!aLastLine.isEmpty()) drawText( aPos, aLastLine, 0, aLastLine.getLength(), bTextLines ); @@ -10700,7 +10695,6 @@ bool PDFWriterImpl::intersectClipRegion( const Rectangle& rRect ) return intersectClipRegion( aRect ); } - bool PDFWriterImpl::intersectClipRegion( const basegfx::B2DPolyPolygon& rRegion ) { basegfx::B2DPolyPolygon aRegion( getReferenceDevice()->LogicToPixel( rRegion, m_aGraphicsStack.front().m_aMapMode ) ); @@ -11649,7 +11643,6 @@ void PDFWriterImpl::setStructureBoundingBox( const Rectangle& rRect ) if( nPageNr < 0 || nPageNr >= (sal_Int32)m_aPages.size() || !m_aContext.Tagged ) return; - if( m_nCurrentStructElement > 0 && m_bEmitStructure ) { PDFWriter::StructElement eType = m_aStructure[ m_nCurrentStructElement ].m_eType; diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index b94e4f404608..07fab7f384ee 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -93,7 +93,6 @@ public: OString getNameObject() const; }; - enum ResourceKind { ResXObject, ResExtGState, ResShading, ResPattern }; typedef std::map< OString, sal_Int32 > ResourceMap; struct ResourceDict @@ -550,7 +549,6 @@ public: PDFAddStream() : m_pStream( NULL ), m_nStreamObject( 0 ), m_bCompress( true ) {} }; - // helper structure for drawLayout and friends struct PDFGlyph { @@ -570,7 +568,6 @@ public: {} }; - static const sal_Char* getStructureTag( PDFWriter::StructElement ); static const sal_Char* getAttributeTag( PDFWriter::StructAttribute eAtr ); static const sal_Char* getAttributeValueTag( PDFWriter::StructAttributeValue eVal ); @@ -679,7 +676,6 @@ private: oslFileHandle m_aFile; bool m_bOpen; - /* output redirection; e.g. to accumulate content streams for XObjects */ @@ -1097,7 +1093,6 @@ public: void setDocumentLocale( const com::sun::star::lang::Locale& rLoc ) { m_aContext.DocumentLocale = rLoc; } - /* graphics state */ void push( sal_uInt16 nFlags ); void pop(); @@ -1106,7 +1101,6 @@ public: void setMapMode( const MapMode& rMapMode ); - const MapMode& getMapMode() { return m_aGraphicsStack.front().m_aMapMode; } void setLineColor( const Color& rColor ) @@ -1302,5 +1296,4 @@ public: #endif //_VCL_PDFEXPORT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index d64d68a59a4d..30b4b6cc4067 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -50,8 +50,6 @@ using namespace com::sun::star::beans; static bool lcl_canUsePDFAxialShading(const Gradient& rGradient); - - void PDFWriterImpl::implWriteGradient( const PolyPolygon& i_rPolyPoly, const Gradient& i_rGradient, VirtualDevice* i_pDummyVDev, const vcl::PDFWriter::PlayMetafileContext& i_rContext ) { @@ -65,8 +63,6 @@ void PDFWriterImpl::implWriteGradient( const PolyPolygon& i_rPolyPoly, const Gra m_rOuterFace.Pop(); } - - void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSize, const BitmapEx& i_rBitmapEx, VirtualDevice* i_pDummyVDev, const vcl::PDFWriter::PlayMetafileContext& i_rContext ) { @@ -243,9 +239,6 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz } } - - - void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevData* i_pOutDevData, const vcl::PDFWriter::PlayMetafileContext& i_rContext, VirtualDevice* pDummyVDev ) { bool bAssertionFired( false ); @@ -868,7 +861,6 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa } break; - case( META_TEXTLINE_ACTION ): { const MetaTextLineAction* pA = (const MetaTextLineAction*) pAction; @@ -1937,7 +1929,6 @@ static const PixelCode BlackPixelCodes[] = { 2560, 12, 0x1F } // 0000 0001 1111 }; - void PDFWriterImpl::putG4Span( long i_nSpan, bool i_bWhitePixel, BitStreamState& io_rState ) { const PixelCode* pTable = i_bWhitePixel ? WhitePixelCodes : BlackPixelCodes; @@ -2066,5 +2057,4 @@ static bool lcl_canUsePDFAxialShading(const Gradient& rGradient) { return true; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index d6eb73f59274..c5009d8586ca 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/pngread.hxx> #include <cmath> @@ -1646,7 +1645,6 @@ void PNGReader::SetIgnoreGammaChunk( bool b ) mpImpl->SetIgnoreGammaChunk( b ); } - } // namespace vcl /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index 6ee397751cd9..ff836c59578d 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/pngwrite.hxx> #include <cmath> diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index f6ebc67f3bc0..7adfcdef8bce 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <list> #include <tools/debug.hxx> @@ -78,7 +77,6 @@ namespace } } - void ImplUpdateJobSetupPaper( JobSetup& rJobSetup ) { const ImplJobSetup* pConstData = rJobSetup.ImplGetConstData(); @@ -117,7 +115,6 @@ PrinterOptions::PrinterOptions() : { } - PrinterOptions::~PrinterOptions() { } @@ -250,7 +247,6 @@ void Printer::DrawDeviceBitmap( const Point& rDestPt, const Size& rDestSize, } } - void Printer::EmulateDrawTransparent ( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) { @@ -328,7 +324,6 @@ void Printer::EmulateDrawTransparent ( const PolyPolygon& rPolyPoly, mpAlphaVDev = pOldAlphaVDev; } - void Printer::DrawOutDev( const Point& /*rDestPt*/, const Size& /*rDestSize*/, const Point& /*rSrcPt*/, const Size& /*rSrcSize*/ ) { @@ -367,7 +362,6 @@ QueueInfo::QueueInfo() mnJobs = 0; } - QueueInfo::QueueInfo( const QueueInfo& rInfo ) : maPrinterName( rInfo.maPrinterName ), maDriver( rInfo.maDriver ), @@ -378,12 +372,10 @@ QueueInfo::QueueInfo( const QueueInfo& rInfo ) : { } - QueueInfo::~QueueInfo() { } - bool QueueInfo::operator==( const QueueInfo& rInfo ) const { return @@ -395,7 +387,6 @@ bool QueueInfo::operator==( const QueueInfo& rInfo ) const mnJobs == rInfo.mnJobs; } - SvStream& WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo ) { VersionCompat aCompat( rOStream, STREAM_WRITE, 1 ); @@ -410,7 +401,6 @@ SvStream& WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo ) return rOStream; } - SvStream& ReadQueueInfo( SvStream& rIStream, QueueInfo& rInfo ) { VersionCompat aCompat( rIStream, STREAM_READ ); @@ -425,7 +415,6 @@ SvStream& ReadQueueInfo( SvStream& rIStream, QueueInfo& rInfo ) return rIStream; } - SalPrinterQueueInfo::SalPrinterQueueInfo() { mnStatus = 0; @@ -433,12 +422,10 @@ SalPrinterQueueInfo::SalPrinterQueueInfo() mpSysData = NULL; } - SalPrinterQueueInfo::~SalPrinterQueueInfo() { } - ImplPrnQueueList::~ImplPrnQueueList() { ImplSVData* pSVData = ImplGetSVData(); @@ -449,7 +436,6 @@ ImplPrnQueueList::~ImplPrnQueueList() } } - void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData ) { boost::unordered_map< OUString, sal_Int32, OUStringHash >::iterator it = @@ -472,7 +458,6 @@ void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData ) } } - ImplPrnQueueData* ImplPrnQueueList::Get( const OUString& rPrinter ) { ImplPrnQueueData* pData = NULL; @@ -483,7 +468,6 @@ ImplPrnQueueData* ImplPrnQueueList::Get( const OUString& rPrinter ) return pData; } - static void ImplInitPrnQueueList() { ImplSVData* pSVData = ImplGetSVData(); @@ -495,7 +479,6 @@ static void ImplInitPrnQueueList() pSVData->mpDefInst->GetPrinterQueueInfo( pSVData->maGDIData.mpPrinterQueueList ); } - void ImplDeletePrnQueueList() { ImplSVData* pSVData = ImplGetSVData(); @@ -508,7 +491,6 @@ void ImplDeletePrnQueueList() } } - const std::vector<OUString>& Printer::GetPrinterQueues() { ImplSVData* pSVData = ImplGetSVData(); @@ -547,7 +529,6 @@ const QueueInfo* Printer::GetQueueInfo( const OUString& rPrinterName, bool bStat return NULL; } - OUString Printer::GetDefaultPrinterName() { static const char* pEnv = getenv( "SAL_DISABLE_DEFAULTPRINTER" ); @@ -560,7 +541,6 @@ OUString Printer::GetDefaultPrinterName() return OUString(); } - void Printer::ImplInitData() { mbDevOutput = false; @@ -803,7 +783,6 @@ void Printer::ImplInit( SalPrinterQueueInfo* pInfo ) mpGraphics->GetDevFontList( mpFontCollection ); } - void Printer::ImplInitDisplay( const Window* pWindow ) { ImplSVData* pSVData = ImplGetSVData(); @@ -955,7 +934,6 @@ SalPrinterQueueInfo* Printer::ImplGetQueueInfo( const OUString& rPrinterName, return NULL; } - void Printer::ImplUpdatePageData() { // we need a graphics @@ -969,7 +947,6 @@ void Printer::ImplUpdatePageData() maPaperSize.Width(), maPaperSize.Height() ); } - void Printer::ImplUpdateFontList() { ImplUpdateFontData( true ); @@ -997,7 +974,6 @@ Printer::Printer() ImplInitDisplay( NULL ); } - Printer::Printer( const JobSetup& rJobSetup ) : maJobSetup( rJobSetup ) { @@ -1016,7 +992,6 @@ Printer::Printer( const JobSetup& rJobSetup ) : } } - Printer::Printer( const QueueInfo& rQueueInfo ) { ImplInitData(); @@ -1028,7 +1003,6 @@ Printer::Printer( const QueueInfo& rQueueInfo ) ImplInitDisplay( NULL ); } - Printer::Printer( const OUString& rPrinterName ) { ImplInitData(); @@ -1039,7 +1013,6 @@ Printer::Printer( const OUString& rPrinterName ) ImplInitDisplay( NULL ); } - Printer::~Printer() { DBG_ASSERT( !IsPrinting(), "Printer::~Printer() - Job is printing" ); @@ -1100,7 +1073,6 @@ sal_uLong Printer::GetCapabilities( sal_uInt16 nType ) const return 0; } - bool Printer::HasSupport( PrinterSupport eFeature ) const { switch ( eFeature ) @@ -1128,7 +1100,6 @@ bool Printer::HasSupport( PrinterSupport eFeature ) const return true; } - bool Printer::SetJobSetup( const JobSetup& rSetup ) { if ( IsDisplayPrinter() || mbInPrintPage ) @@ -1150,8 +1121,6 @@ bool Printer::SetJobSetup( const JobSetup& rSetup ) return false; } - - bool Printer::Setup( Window* pWindow ) { if ( IsDisplayPrinter() ) @@ -1187,7 +1156,6 @@ bool Printer::Setup( Window* pWindow ) return false; } - bool Printer::SetPrinterProps( const Printer* pPrinter ) { if ( IsJobActive() || IsPrinting() ) @@ -1295,7 +1263,6 @@ bool Printer::SetPrinterProps( const Printer* pPrinter ) return false; } - bool Printer::SetOrientation( Orientation eOrientation ) { if ( mbInPrintPage ) @@ -1331,13 +1298,11 @@ bool Printer::SetOrientation( Orientation eOrientation ) return true; } - Orientation Printer::GetOrientation() const { return maJobSetup.ImplGetConstData()->meOrientation; } - bool Printer::SetPaperBin( sal_uInt16 nPaperBin ) { if ( mbInPrintPage ) @@ -1374,13 +1339,11 @@ bool Printer::SetPaperBin( sal_uInt16 nPaperBin ) return true; } - sal_uInt16 Printer::GetPaperBin() const { return maJobSetup.ImplGetConstData()->mnPaperBin; } - // Map user paper format to a available printer paper formats void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup, bool bMatchNearest ) { @@ -1470,7 +1433,6 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup, bool bMatchNe } } - bool Printer::SetPaper( Paper ePaper ) { if ( mbInPrintPage ) @@ -1514,7 +1476,6 @@ bool Printer::SetPaper( Paper ePaper ) return true; } - bool Printer::SetPaperSizeUser( const Size& rSize ) { return SetPaperSizeUser( rSize, false ); @@ -1578,7 +1539,6 @@ bool Printer::SetPaperSizeUser( const Size& rSize, bool bMatchNearest ) return true; } - int Printer::GetPaperInfoCount() const { if( ! mpInfoPrinter ) @@ -1588,7 +1548,6 @@ int Printer::GetPaperInfoCount() const return mpInfoPrinter->m_aPaperFormats.size(); } - OUString Printer::GetPaperName( Paper ePaper ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1619,7 +1578,6 @@ OUString Printer::GetPaperName( Paper ePaper ) return (it != pSVData->mpPaperNames->end()) ? it->second : OUString(); } - OUString Printer::GetPaperName( bool i_bPaperUser ) const { Size aPageSize = PixelToLogic( GetPaperSizePixel(), MAP_100TH_MM ); @@ -1629,7 +1587,6 @@ OUString Printer::GetPaperName( bool i_bPaperUser ) const return (ePaper != PAPER_USER || i_bPaperUser ) ? GetPaperName( ePaper ) : OUString(); } - const PaperInfo& Printer::GetPaperInfo( int nPaper ) const { if( ! mpInfoPrinter ) @@ -1641,7 +1598,6 @@ const PaperInfo& Printer::GetPaperInfo( int nPaper ) const return mpInfoPrinter->m_aPaperFormats[nPaper]; } - bool Printer::SetDuplexMode( DuplexMode eDuplex ) { if ( mbInPrintPage ) @@ -1677,19 +1633,16 @@ bool Printer::SetDuplexMode( DuplexMode eDuplex ) return true; } - int Printer::GetLandscapeAngle() const { return mpInfoPrinter ? mpInfoPrinter->GetLandscapeAngle( maJobSetup.ImplGetConstData() ) : 900; } - Paper Printer::GetPaper() const { return maJobSetup.ImplGetConstData()->mePaperFormat; } - sal_uInt16 Printer::GetPaperBinCount() const { if ( IsDisplayPrinter() ) @@ -1698,7 +1651,6 @@ sal_uInt16 Printer::GetPaperBinCount() const return (sal_uInt16)mpInfoPrinter->GetPaperBinCount( maJobSetup.ImplGetConstData() ); } - OUString Printer::GetPaperBinName( sal_uInt16 nPaperBin ) const { if ( IsDisplayPrinter() ) @@ -1710,7 +1662,6 @@ OUString Printer::GetPaperBinName( sal_uInt16 nPaperBin ) const return OUString(); } - bool Printer::SetCopyCount( sal_uInt16 nCopy, bool bCollate ) { mnCopyCount = nCopy; @@ -1718,14 +1669,11 @@ bool Printer::SetCopyCount( sal_uInt16 nCopy, bool bCollate ) return true; } - void Printer::Error() { maErrorHdl.Call( this ); } - - sal_uLong Printer::ImplSalPrinterErrorCodeToVCL( sal_uLong nError ) { sal_uLong nVCLError; @@ -1745,7 +1693,6 @@ sal_uLong Printer::ImplSalPrinterErrorCodeToVCL( sal_uLong nError ) return nVCLError; } - bool Printer::EndJob() { bool bRet = false; @@ -1778,7 +1725,6 @@ bool Printer::EndJob() return bRet; } - void Printer::ImplStartPage() { if ( !IsJobActive() ) @@ -1804,7 +1750,6 @@ void Printer::ImplStartPage() } } - void Printer::ImplEndPage() { if ( !IsJobActive() ) @@ -1823,7 +1768,6 @@ void Printer::ImplEndPage() } } - void Printer::updatePrinters() { ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index 098deabe588e..c16e702c6121 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -713,12 +713,8 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, // 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 ConnectedComponents aBackgroundComponent; @@ -860,11 +856,8 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, ++nActionNum; } - // STAGE 2: Generate connected components list - - // iterate over all actions (start where background action // search left off) for( ; @@ -888,11 +881,8 @@ 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. // Furthermore, this ensures that non-output-generating @@ -983,11 +973,8 @@ 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 // added action is the very first action, or all actions @@ -1053,12 +1040,8 @@ 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; aTotalComponents.aComponentList.push_back( @@ -1104,11 +1087,8 @@ 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() ); for( ; aCurrAct != aLastAct; ++aCurrAct ) @@ -1118,12 +1098,8 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, rOutMtf.AddAction( ( aCurrAct->first->Duplicate(), aCurrAct->first ) ); } - - // STAGE 3.2: Generate banded bitmaps for special regions - - Point aPageOffset; Size aTmpSize( GetOutputSizePixel() ); if( mpPDFWriter ) @@ -1296,11 +1272,8 @@ 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 for( pCurrAct=const_cast<GDIMetaFile&>(rInMtf).FirstAction(), nActionNum=0; diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index be3dc9c3c8f4..d64213e7f709 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -553,7 +553,6 @@ bool Printer::StartJob( const OUString& i_rJobName, boost::shared_ptr<vcl::Print else bCollateCopy = false; - ImplSVData* pSVData = ImplGetSVData(); mpPrinter = pSVData->mpDefInst->CreatePrinter( mpInfoPrinter ); @@ -1202,7 +1201,6 @@ sal_uLong PrinterController::removeTransparencies( GDIMetaFile& i_rIn, GDIMetaFi static const sal_Int32 OPTIMAL_BMP_RESOLUTION = 300; static const sal_Int32 NORMAL_BMP_RESOLUTION = 200; - if( rPrinterOptions.IsReduceBitmaps() ) { // calculate maximum resolution for bitmap graphics diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx index c54d22ced48f..4268f9fc72c2 100644 --- a/vcl/source/gdi/regband.cxx +++ b/vcl/source/gdi/regband.cxx @@ -25,8 +25,6 @@ #include "regband.hxx" - - // ImplRegionBand // Each band contains all rectangles between upper and lower border. @@ -41,9 +39,6 @@ // 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 ) { // save boundaries @@ -58,8 +53,6 @@ ImplRegionBand::ImplRegionBand( long nTop, long nBottom ) mbTouched = false; } - - ImplRegionBand::ImplRegionBand( const ImplRegionBand& rRegionBand, const bool bIgnorePoints) @@ -120,8 +113,6 @@ ImplRegionBand::ImplRegionBand( } } - - ImplRegionBand::~ImplRegionBand() { DBG_ASSERT( mpFirstBandPoint == NULL, "ImplRegionBand::~ImplRegionBand -> pointlist not empty" ); @@ -145,8 +136,6 @@ ImplRegionBand::~ImplRegionBand() } } - - // generate separations from lines and process union with existing // separations @@ -198,8 +187,6 @@ void ImplRegionBand::ProcessPoints() mpFirstBandPoint = NULL; } - - // generate separations from lines and process union with existing // separations @@ -311,8 +298,6 @@ bool ImplRegionBand::InsertPoint( long nX, long nLineId, return true; } - - void ImplRegionBand::MoveX( long nHorzMove ) { // move all x-separations @@ -325,8 +310,6 @@ void ImplRegionBand::MoveX( long nHorzMove ) } } - - void ImplRegionBand::ScaleX( double fHorzScale ) { ImplRegionBandSep* pSep = mpFirstSep; @@ -338,8 +321,6 @@ void ImplRegionBand::ScaleX( double fHorzScale ) } } - - // combine overlapping separations bool ImplRegionBand::OptimizeBand() @@ -383,8 +364,6 @@ bool ImplRegionBand::OptimizeBand() return true; } - - void ImplRegionBand::Union( long nXLeft, long nXRight ) { DBG_ASSERT( nXLeft <= nXRight, "ImplRegionBand::Union(): nxLeft > nXRight" ); @@ -457,8 +436,6 @@ void ImplRegionBand::Union( long nXLeft, long nXRight ) OptimizeBand(); } - - void ImplRegionBand::Intersect( long nXLeft, long nXRight ) { DBG_ASSERT( nXLeft <= nXRight, "ImplRegionBand::Intersect(): nxLeft > nXRight" ); @@ -504,8 +481,6 @@ void ImplRegionBand::Intersect( long nXLeft, long nXRight ) OptimizeBand(); } - - void ImplRegionBand::Exclude( long nXLeft, long nXRight ) { DBG_ASSERT( nXLeft <= nXRight, "ImplRegionBand::Exclude(): nxLeft > nXRight" ); @@ -584,8 +559,6 @@ void ImplRegionBand::Exclude( long nXLeft, long nXRight ) OptimizeBand(); } - - void ImplRegionBand::XOr( long nXLeft, long nXRight ) { DBG_ASSERT( nXLeft <= nXRight, "ImplRegionBand::XOr(): nxLeft > nXRight" ); @@ -623,7 +596,6 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight ) // #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: @@ -635,7 +607,6 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight ) // trailing band sep from 11 to 14. This mimicks the xor look of a // bitmap operation. - // band empty? -> add element if ( !mpFirstSep ) { @@ -831,8 +802,6 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight ) OptimizeBand(); } - - bool ImplRegionBand::IsInside( long nX ) { ImplRegionBandSep* pSep = mpFirstSep; @@ -847,8 +816,6 @@ bool ImplRegionBand::IsInside( long nX ) return false; } - - long ImplRegionBand::GetXLeftBoundary() const { DBG_ASSERT( mpFirstSep != NULL, "ImplRegionBand::XLeftBoundary -> no separation in band!" ); @@ -856,8 +823,6 @@ long ImplRegionBand::GetXLeftBoundary() const return mpFirstSep->mnXLeft; } - - long ImplRegionBand::GetXRightBoundary() const { DBG_ASSERT( mpFirstSep != NULL, "ImplRegionBand::XRightBoundary -> no separation in band!" ); @@ -869,8 +834,6 @@ long ImplRegionBand::GetXRightBoundary() const return pSep->mnXRight; } - - bool ImplRegionBand::operator==( const ImplRegionBand& rRegionBand ) const { ImplRegionBandSep* pOwnRectBandSep = mpFirstSep; @@ -902,8 +865,6 @@ bool ImplRegionBand::operator==( const ImplRegionBand& rRegionBand ) const return true; } - - ImplRegionBand* ImplRegionBand::SplitBand (const sal_Int32 nY) { OSL_ASSERT(nY>mnYTop); diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index ff8314c61d57..a6cfb65ec782 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -32,11 +32,6 @@ #include <basegfx/range/b2drange.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> - - - - - namespace { /** Return <TRUE/> when the given polygon is rectiliner and oriented so that @@ -226,8 +221,6 @@ namespace } } // end of anonymous namespace - - bool Region::IsEmpty() const { return !mbIsNull && !mpB2DPolyPolygon.get() && !mpPolyPolygon.get() && !mpRegionBand.get(); @@ -1419,8 +1412,6 @@ bool Region::IsInside( const Rectangle& rRect ) const return aRegion.IsEmpty(); } - - bool Region::IsOver( const Rectangle& rRect ) const { if(IsEmpty()) diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx index b74a780cff67..fa767433d0f9 100644 --- a/vcl/source/gdi/regionband.cxx +++ b/vcl/source/gdi/regionband.cxx @@ -21,11 +21,6 @@ #include <tools/debug.hxx> #include <regionband.hxx> - - - - - RegionBand::RegionBand() : mpFirstBand(0), mpLastCheckedBand(0) @@ -62,7 +57,6 @@ RegionBand& RegionBand::operator=(const RegionBand& rRef) pBand = pBand->mpNextBand; } - return *this; } diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index f22568e87479..faac7782b899 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -71,7 +71,6 @@ FILE * mslLog() } #endif - std::ostream &operator <<(std::ostream& s, ImplLayoutArgs &rArgs) { #ifndef SAL_LOG_INFO @@ -185,8 +184,6 @@ bool IsDiacritic( sal_UCS4 nChar ) return false; } - - int GetVerticalFlags( sal_UCS4 nChar ) { if( (nChar >= 0x1100 && nChar <= 0x11f9) // Hangul Jamo @@ -215,23 +212,17 @@ int GetVerticalFlags( sal_UCS4 nChar ) return GF_NONE; // not rotated as default } - - sal_UCS4 GetVerticalChar( sal_UCS4 ) { return 0; // #i14788# input method is responsible vertical char changes } - - VCL_DLLPUBLIC sal_UCS4 GetMirroredChar( sal_UCS4 nChar ) { nChar = u_charMirror( nChar ); return nChar; } - - VCL_DLLPUBLIC sal_UCS4 GetLocalizedChar( sal_UCS4 nChar, LanguageType eLang ) { // currently only conversion from ASCII digits is interesting @@ -324,8 +315,6 @@ VCL_DLLPUBLIC sal_UCS4 GetLocalizedChar( sal_UCS4 nChar, LanguageType eLang ) return nChar; } - - inline bool IsControlChar( sal_UCS4 cChar ) { // C0 control characters @@ -347,8 +336,6 @@ inline bool IsControlChar( sal_UCS4 cChar ) return false; } - - bool ImplLayoutRuns::AddPos( int nCharPos, bool bRTL ) { // check if charpos could extend current run @@ -376,8 +363,6 @@ bool ImplLayoutRuns::AddPos( int nCharPos, bool bRTL ) return true; } - - bool ImplLayoutRuns::AddRun( int nCharPos0, int nCharPos1, bool bRTL ) { if( nCharPos0 == nCharPos1 ) @@ -397,8 +382,6 @@ bool ImplLayoutRuns::AddRun( int nCharPos0, int nCharPos1, bool bRTL ) return true; } - - bool ImplLayoutRuns::PosIsInRun( int nCharPos ) const { if( mnRunIndex >= (int)maRuns.size() ) @@ -440,9 +423,6 @@ bool ImplLayoutRuns::PosIsInAnyRun( int nCharPos ) const return bRet; } - - - bool ImplLayoutRuns::GetNextPos( int* nCharPos, bool* bRightToLeft ) { // negative nCharPos => reset to first run @@ -487,8 +467,6 @@ bool ImplLayoutRuns::GetNextPos( int* nCharPos, bool* bRightToLeft ) return true; } - - bool ImplLayoutRuns::GetRun( int* nMinRunPos, int* nEndRunPos, bool* bRightToLeft ) const { if( mnRunIndex >= (int)maRuns.size() ) @@ -510,8 +488,6 @@ 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 ) : @@ -583,8 +559,6 @@ ImplLayoutArgs::ImplLayoutArgs( const sal_Unicode* pStr, int nLen, maRuns.ResetPos(); } - - // add a run after splitting it up to get rid of control chars void ImplLayoutArgs::AddRun( int nCharPos0, int nCharPos1, bool bRTL ) { @@ -616,8 +590,6 @@ void ImplLayoutArgs::AddRun( int nCharPos0, int nCharPos1, bool bRTL ) maRuns.AddRun( nCharPos0, nCharPos1, bRTL ); } - - bool ImplLayoutArgs::PrepareFallback() { // short circuit if no fallback is needed @@ -665,8 +637,6 @@ bool ImplLayoutArgs::PrepareFallback() return true; } - - bool ImplLayoutArgs::GetNextRun( int* nMinRunPos, int* nEndRunPos, bool* bRTL ) { bool bValid = maRuns.GetRun( nMinRunPos, nEndRunPos, bRTL ); @@ -674,8 +644,6 @@ bool ImplLayoutArgs::GetNextRun( int* nMinRunPos, int* nEndRunPos, bool* bRTL ) return bValid; } - - SalLayout::SalLayout() : mnMinCharPos( -1 ), mnEndCharPos( -1 ), @@ -686,13 +654,9 @@ SalLayout::SalLayout() maDrawOffset( 0, 0 ) {} - - SalLayout::~SalLayout() {} - - void SalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) { mnMinCharPos = rArgs.mnMinCharPos; @@ -701,8 +665,6 @@ void SalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) mnOrientation = rArgs.mnOrientation; } - - void SalLayout::Release() const { // TODO: protect when multiple threads can access this @@ -712,8 +674,6 @@ void SalLayout::Release() const delete const_cast<SalLayout*>(this); } - - Point SalLayout::GetDrawPosition( const Point& rRelative ) const { Point aPos = maDrawBase; @@ -744,8 +704,6 @@ Point SalLayout::GetDrawPosition( const Point& rRelative ) const return aPos; } - - // returns asian kerning values in quarter of character width units // to enable automatic halfwidth substitution for fullwidth punctuation // return value is negative for l, positive for r, zero for neutral @@ -787,8 +745,6 @@ int SalLayout::CalcAsianKerning( sal_UCS4 c, bool bLeft, bool /*TODO:? bVertical return nResult; } - - bool SalLayout::GetOutline( SalGraphics& rSalGraphics, ::basegfx::B2DPolyPolygonVector& rVector ) const { @@ -823,8 +779,6 @@ bool SalLayout::GetOutline( SalGraphics& rSalGraphics, return (bAllOk && bOneOk); } - - bool SalLayout::GetBoundRect( SalGraphics& rSalGraphics, Rectangle& rRect ) const { bool bRet = false; @@ -854,8 +808,6 @@ bool SalLayout::GetBoundRect( SalGraphics& rSalGraphics, Rectangle& rRect ) cons return bRet; } - - bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph ) const { bool bRet = false; @@ -872,25 +824,17 @@ bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph ) const return bRet; } - - GenericSalLayout::GenericSalLayout() {} - - GenericSalLayout::~GenericSalLayout() {} - - void GenericSalLayout::AppendGlyph( const GlyphItem& rGlyphItem ) { m_GlyphItems.push_back(rGlyphItem); } - - bool GenericSalLayout::GetCharWidths( sal_Int32* pCharWidths ) const { // initialize character extents buffer @@ -965,8 +909,6 @@ bool GenericSalLayout::GetCharWidths( sal_Int32* pCharWidths ) const return true; } - - long GenericSalLayout::FillDXArray( sal_Int32* pCharWidths ) const { if( pCharWidths ) @@ -977,8 +919,6 @@ long GenericSalLayout::FillDXArray( sal_Int32* pCharWidths ) const return nWidth; } - - // the text width is the maximum logical extent of all glyphs long GenericSalLayout::GetTextWidth() const { @@ -1004,8 +944,6 @@ long GenericSalLayout::GetTextWidth() const return nWidth; } - - void GenericSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) { SalLayout::AdjustLayout( rArgs ); @@ -1016,8 +954,6 @@ void GenericSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) Justify( rArgs.mnLayoutWidth ); } - - // This DXArray thing is one of the stupidest ideas I have ever seen (I've been // told that it probably a one-to-one mapping of some Windows 3.1 API, which is // telling). To justify a text string, Writer calls OutputDevice::GetTextArray() @@ -1144,8 +1080,6 @@ void GenericSalLayout::ApplyDXArray( ImplLayoutArgs& rArgs ) } } - - void GenericSalLayout::Justify( long nNewWidth ) { nNewWidth *= mnUnitsPerPixel; @@ -1222,8 +1156,6 @@ void GenericSalLayout::Justify( long nNewWidth ) } } - - void GenericSalLayout::ApplyAsianKerning( const sal_Unicode* pStr, int nLength ) { long nOffset = 0; @@ -1264,8 +1196,6 @@ void GenericSalLayout::ApplyAsianKerning( const sal_Unicode* pStr, int nLength ) } } - - void GenericSalLayout::KashidaJustify( long nKashidaIndex, int nKashidaWidth ) { // TODO: reimplement method when container type for GlyphItems changes @@ -1317,8 +1247,6 @@ void GenericSalLayout::KashidaJustify( long nKashidaIndex, int nKashidaWidth ) } } - - void GenericSalLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray ) const { // initialize result array @@ -1349,8 +1277,6 @@ void GenericSalLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray } } - - sal_Int32 GenericSalLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const { int nCharCapacity = mnEndCharPos - mnMinCharPos; @@ -1370,8 +1296,6 @@ sal_Int32 GenericSalLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int n return -1; } - - int GenericSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos, int& nStart, sal_Int32* pGlyphAdvAry, int* pCharPosAry, const PhysicalFontFace** /*pFallbackFonts*/ ) const @@ -1458,8 +1382,6 @@ int GenericSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos return nCount; } - - void GenericSalLayout::MoveGlyph( int nStart, long nNewXPos ) { if( nStart >= (int)m_GlyphItems.size() ) @@ -1485,8 +1407,6 @@ void GenericSalLayout::MoveGlyph( int nStart, long nNewXPos ) } } - - void GenericSalLayout::DropGlyph( int nStart ) { if( nStart >= (int)m_GlyphItems.size()) @@ -1498,8 +1418,6 @@ void GenericSalLayout::DropGlyph( int nStart ) pG->mnCharPos = -1; } - - void GenericSalLayout::Simplify( bool bIsBase ) { const sal_GlyphId nDropMarker = bIsBase ? GF_DROPPED : 0; @@ -1520,8 +1438,6 @@ void GenericSalLayout::Simplify( bool bIsBase ) m_GlyphItems.erase(m_GlyphItems.begin() + j, m_GlyphItems.end()); } - - // make sure GlyphItems are sorted left to right void GenericSalLayout::SortGlyphItems() { @@ -1557,8 +1473,6 @@ void GenericSalLayout::SortGlyphItems() } } - - MultiSalLayout::MultiSalLayout( SalLayout& rBaseLayout, const PhysicalFontFace* pBaseFont ) : SalLayout() , mnLevel( 1 ) @@ -1576,16 +1490,12 @@ void MultiSalLayout::SetInComplete(bool bInComplete) maFallbackRuns[mnLevel-1] = ImplLayoutRuns(); } - - MultiSalLayout::~MultiSalLayout() { for( int i = 0; i < mnLevel; ++i ) mpLayouts[ i ]->Release(); } - - bool MultiSalLayout::AddFallback( SalLayout& rFallback, ImplLayoutRuns& rFallbackRuns, const PhysicalFontFace* pFallbackFont ) { @@ -1599,8 +1509,6 @@ bool MultiSalLayout::AddFallback( SalLayout& rFallback, return true; } - - bool MultiSalLayout::LayoutText( ImplLayoutArgs& rArgs ) { if( mnLevel <= 1 ) @@ -1610,8 +1518,6 @@ bool MultiSalLayout::LayoutText( ImplLayoutArgs& rArgs ) return true; } - - void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) { SalLayout::AdjustLayout( rArgs ); @@ -1979,16 +1885,12 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) mpLayouts[n]->DisableGlyphInjection( false ); } - - void MultiSalLayout::InitFont() const { if( mnLevel > 0 ) mpLayouts[0]->InitFont(); } - - void MultiSalLayout::DrawText( SalGraphics& rGraphics ) const { for( int i = mnLevel; --i >= 0; ) @@ -2004,8 +1906,6 @@ void MultiSalLayout::DrawText( SalGraphics& rGraphics ) const // NOTE: now the baselevel font is active again } - - sal_Int32 MultiSalLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const { if( mnLevel <= 0 ) @@ -2043,8 +1943,6 @@ sal_Int32 MultiSalLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFa return -1; } - - long MultiSalLayout::FillDXArray( sal_Int32* pCharWidths ) const { long nMaxWidth = 0; @@ -2091,8 +1989,6 @@ long MultiSalLayout::FillDXArray( sal_Int32* pCharWidths ) const return nMaxWidth; } - - void MultiSalLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray ) const { SalLayout& rLayout = *mpLayouts[ 0 ]; @@ -2117,8 +2013,6 @@ void MultiSalLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray ) } } - - int MultiSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& rPos, int& nStart, sal_Int32* pGlyphAdvAry, int* pCharPosAry, const PhysicalFontFace** pFallbackFonts ) const @@ -2167,8 +2061,6 @@ int MultiSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& r return 0; } - - bool MultiSalLayout::GetOutline( SalGraphics& rGraphics, ::basegfx::B2DPolyPolygonVector& rPPV ) const { diff --git a/vcl/source/gdi/salnativewidgets-none.cxx b/vcl/source/gdi/salnativewidgets-none.cxx index bdb9fb3ea09a..baa2cb398930 100644 --- a/vcl/source/gdi/salnativewidgets-none.cxx +++ b/vcl/source/gdi/salnativewidgets-none.cxx @@ -17,15 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <salgdi.hxx> - /**************************************************************** * Placeholder for no native widgets ***************************************************************/ - /* * IsNativeControlSupported() * @@ -37,7 +34,6 @@ bool SalGraphics::IsNativeControlSupported( ControlType, ControlPart ) return false; } - /* * HitTestNativeControl() * @@ -54,7 +50,6 @@ bool SalGraphics::hitTestNativeControl( ControlType, return false; } - /* * DrawNativeControl() * diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx index fa3ebdf1e1d5..4080f5d36d67 100644 --- a/vcl/source/gdi/svgdata.cxx +++ b/vcl/source/gdi/svgdata.cxx @@ -29,12 +29,8 @@ #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> - - using namespace ::com::sun::star; - - BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( const Primitive2DSequence& rSequence, const basegfx::B2DRange& rTargetRange, @@ -91,8 +87,6 @@ BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( return aRetval; } - - void SvgData::ensureReplacement() { ensureSequenceAndRange(); @@ -103,8 +97,6 @@ void SvgData::ensureReplacement() } } - - void SvgData::ensureSequenceAndRange() { if(!maSequence.hasElements() && mnSvgDataArrayLength) @@ -160,8 +152,6 @@ void SvgData::ensureSequenceAndRange() } } - - SvgData::SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLength, const OUString& rPath) : maSvgDataArray(rSvgDataArray), mnSvgDataArrayLength(nSvgDataArrayLength), @@ -172,7 +162,6 @@ SvgData::SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLeng { } - SvgData::SvgData(const OUString& rPath): maSvgDataArray(), mnSvgDataArrayLength(0), @@ -200,8 +189,6 @@ SvgData::SvgData(const OUString& rPath): } } - - const basegfx::B2DRange& SvgData::getRange() const { const_cast< SvgData* >(this)->ensureSequenceAndRange(); @@ -209,8 +196,6 @@ const basegfx::B2DRange& SvgData::getRange() const return maRange; } - - const Primitive2DSequence& SvgData::getPrimitive2DSequence() const { const_cast< SvgData* >(this)->ensureSequenceAndRange(); @@ -218,8 +203,6 @@ const Primitive2DSequence& SvgData::getPrimitive2DSequence() const return maSequence; } - - const BitmapEx& SvgData::getReplacement() const { const_cast< SvgData* >(this)->ensureReplacement(); diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx index b54a0421bfd7..35010b17ae97 100644 --- a/vcl/source/gdi/textlayout.cxx +++ b/vcl/source/gdi/textlayout.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/ctrl.hxx" #include "vcl/outdev.hxx" diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index 1b3fba203211..856a35893dd5 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/debug.hxx> #include <vcl/settings.hxx> @@ -368,8 +367,6 @@ bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, bool bEra return bRet; } - - // #i32109#: Fill opaque areas correctly (without relying on // fill/linecolor state) void VirtualDevice::ImplFillOpaqueRectangle( const Rectangle& rRect ) @@ -384,8 +381,6 @@ void VirtualDevice::ImplFillOpaqueRectangle( const Rectangle& rRect ) Pop(); } - - bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, bool bErase, const basebmp::RawMemorySharedArray &pBuffer ) { if( InnerImplSetOutputSizePixel(rNewSize, bErase, pBuffer) ) diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx index af7a3a0f20b6..8891165fc966 100644 --- a/vcl/source/gdi/wall.cxx +++ b/vcl/source/gdi/wall.cxx @@ -28,8 +28,6 @@ #include <vcl/dibtools.hxx> #include <vcl/settings.hxx> - - ImplWallpaper::ImplWallpaper() : maColor( COL_TRANSPARENT ) { @@ -41,8 +39,6 @@ ImplWallpaper::ImplWallpaper() : meStyle = WALLPAPER_NULL; } - - ImplWallpaper::ImplWallpaper( const ImplWallpaper& rImplWallpaper ) : maColor( rImplWallpaper.maColor ) { @@ -67,8 +63,6 @@ ImplWallpaper::ImplWallpaper( const ImplWallpaper& rImplWallpaper ) : mpRect = NULL; } - - ImplWallpaper::~ImplWallpaper() { delete mpBitmap; @@ -77,8 +71,6 @@ ImplWallpaper::~ImplWallpaper() delete mpRect; } - - void ImplWallpaper::ImplSetCachedBitmap( BitmapEx& rBmp ) { if( !mpCache ) @@ -87,16 +79,12 @@ void ImplWallpaper::ImplSetCachedBitmap( BitmapEx& rBmp ) *mpCache = rBmp; } - - void ImplWallpaper::ImplReleaseCachedBitmap() { delete mpCache; mpCache = NULL; } - - SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper ) { VersionCompat aCompat( rIStm, STREAM_READ ); @@ -150,8 +138,6 @@ SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper ) return rIStm; } - - SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpaper ) { VersionCompat aCompat( rOStm, STREAM_WRITE, 3 ); @@ -182,8 +168,6 @@ SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpap return rOStm; } - - inline void Wallpaper::ImplMakeUnique( bool bReleaseCache ) { // copy them if other references exist @@ -198,8 +182,6 @@ inline void Wallpaper::ImplMakeUnique( bool bReleaseCache ) mpImplWallpaper->ImplReleaseCachedBitmap(); } - - Wallpaper::Wallpaper() { @@ -209,8 +191,6 @@ Wallpaper::Wallpaper() mpImplWallpaper = &aStaticImplWallpaper; } - - Wallpaper::Wallpaper( const Wallpaper& rWallpaper ) { DBG_ASSERT( rWallpaper.mpImplWallpaper->mnRefCount < 0xFFFFFFFE, "Wallpaper: RefCount overflow" ); @@ -222,8 +202,6 @@ Wallpaper::Wallpaper( const Wallpaper& rWallpaper ) mpImplWallpaper->mnRefCount++; } - - Wallpaper::Wallpaper( const Color& rColor ) { @@ -232,8 +210,6 @@ Wallpaper::Wallpaper( const Color& rColor ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } - - Wallpaper::Wallpaper( const BitmapEx& rBmpEx ) { @@ -242,8 +218,6 @@ Wallpaper::Wallpaper( const BitmapEx& rBmpEx ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } - - Wallpaper::Wallpaper( const Gradient& rGradient ) { @@ -252,8 +226,6 @@ Wallpaper::Wallpaper( const Gradient& rGradient ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } - - Wallpaper::~Wallpaper() { // if ImpData are not static then delete them if it is the last reference, @@ -267,8 +239,6 @@ Wallpaper::~Wallpaper() } } - - void Wallpaper::SetColor( const Color& rColor ) { @@ -279,16 +249,12 @@ void Wallpaper::SetColor( const Color& rColor ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } - - const Color& Wallpaper::GetColor() const { return mpImplWallpaper->maColor; } - - void Wallpaper::SetStyle( WallpaperStyle eStyle ) { @@ -302,16 +268,12 @@ void Wallpaper::SetStyle( WallpaperStyle eStyle ) mpImplWallpaper->meStyle = eStyle; } - - WallpaperStyle Wallpaper::GetStyle() const { return mpImplWallpaper->meStyle; } - - void Wallpaper::SetBitmap( const BitmapEx& rBitmap ) { @@ -337,8 +299,6 @@ void Wallpaper::SetBitmap( const BitmapEx& rBitmap ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } - - BitmapEx Wallpaper::GetBitmap() const { @@ -351,17 +311,12 @@ BitmapEx Wallpaper::GetBitmap() const } } - - bool Wallpaper::IsBitmap() const { return (mpImplWallpaper->mpBitmap != 0); } - - - void Wallpaper::SetGradient( const Gradient& rGradient ) { @@ -376,8 +331,6 @@ void Wallpaper::SetGradient( const Gradient& rGradient ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } - - Gradient Wallpaper::GetGradient() const { @@ -392,17 +345,12 @@ Gradient Wallpaper::GetGradient() const } } - - bool Wallpaper::IsGradient() const { return (mpImplWallpaper->mpGradient != 0); } - - - Gradient Wallpaper::ImplGetApplicationGradient() const { Gradient g; @@ -417,8 +365,6 @@ Gradient Wallpaper::ImplGetApplicationGradient() const return g; } - - void Wallpaper::SetRect( const Rectangle& rRect ) { @@ -441,8 +387,6 @@ void Wallpaper::SetRect( const Rectangle& rRect ) } } - - Rectangle Wallpaper::GetRect() const { @@ -455,17 +399,12 @@ Rectangle Wallpaper::GetRect() const } } - - bool Wallpaper::IsRect() const { return (mpImplWallpaper->mpRect != 0); } - - - bool Wallpaper::IsFixed() const { if ( mpImplWallpaper->meStyle == WALLPAPER_NULL ) @@ -474,8 +413,6 @@ bool Wallpaper::IsFixed() const return (!mpImplWallpaper->mpBitmap && !mpImplWallpaper->mpGradient); } - - bool Wallpaper::IsScrollable() const { if ( mpImplWallpaper->meStyle == WALLPAPER_NULL ) @@ -488,8 +425,6 @@ bool Wallpaper::IsScrollable() const return false; } - - Wallpaper& Wallpaper::operator=( const Wallpaper& rWallpaper ) { DBG_ASSERT( rWallpaper.mpImplWallpaper->mnRefCount < 0xFFFFFFFE, "Wallpaper: RefCount overflow" ); @@ -513,8 +448,6 @@ Wallpaper& Wallpaper::operator=( const Wallpaper& rWallpaper ) return *this; } - - bool Wallpaper::operator==( const Wallpaper& rWallpaper ) const { @@ -546,16 +479,12 @@ bool Wallpaper::operator==( const Wallpaper& rWallpaper ) const return true; } - - SvStream& ReadWallpaper( SvStream& rIStm, Wallpaper& rWallpaper ) { rWallpaper.ImplMakeUnique(); return ReadImplWallpaper( rIStm, *rWallpaper.mpImplWallpaper ); } - - SvStream& WriteWallpaper( SvStream& rOStm, const Wallpaper& rWallpaper ) { return WriteImplWallpaper( rOStm, *rWallpaper.mpImplWallpaper ); |