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 | |
| parent | db1c9e4dadc90c5afe3190776a60cc5dcbbce3ac (diff) | |
Kill superfluous vertical whitespace
Change-Id: I81ce8fd7022bf283db668705efdfb0666f87bde9
Diffstat (limited to 'vcl')
443 files changed, 0 insertions, 7140 deletions
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx index 25f885377ba5..21d9007604ba 100644 --- a/vcl/android/androidinst.cxx +++ b/vcl/android/androidinst.cxx @@ -293,7 +293,6 @@ SalFrame *AndroidSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nStyle ) return new AndroidSalFrame( this, pParent, nStyle, NULL ); } - // All the interesting stuff is slaved from the AndroidSalInstance void InitSalData() {} void DeInitSalData() {} diff --git a/vcl/generic/app/gendisp.cxx b/vcl/generic/app/gendisp.cxx index 0e197c15d24a..1275465c4fb1 100644 --- a/vcl/generic/app/gendisp.cxx +++ b/vcl/generic/app/gendisp.cxx @@ -21,7 +21,6 @@ #include <generic/gendisp.hxx> #include <generic/geninst.h> - SalGenericDisplay::SalGenericDisplay() { m_pCapture = NULL; @@ -145,6 +144,4 @@ bool SalGenericDisplay::HasUserEvents() const return bRet; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/generic/app/geninst.cxx b/vcl/generic/app/geninst.cxx index 1bb9fa4d3172..cf2f301e3805 100644 --- a/vcl/generic/app/geninst.cxx +++ b/vcl/generic/app/geninst.cxx @@ -26,12 +26,8 @@ #include "generic/geninst.h" - - // SalYieldMutex - - SalYieldMutex::SalYieldMutex() { mnCount = 0; diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/generic/fontmanager/fontcache.cxx index ea5b443cc0a3..8a0f809ff5d9 100644 --- a/vcl/generic/fontmanager/fontcache.cxx +++ b/vcl/generic/fontmanager/fontcache.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <cstdlib> #include <cstring> @@ -45,7 +44,6 @@ using namespace std; using namespace psp; using namespace utl; - /* * FontCache constructor */ @@ -247,7 +245,6 @@ void FontCache::read() return; } - OString aLine; aStream.ReadLine( aLine ); if ( !(aLine == CACHE_MAGIC) ) diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index e145c6803be8..05581c55792d 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fontcache.hxx" #include "impfont.hxx" #include "fontmanager.hxx" diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index e5854a310579..12bc30713155 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -50,7 +50,6 @@ #include "i18nlangtag/mslangid.hxx" - #include "parseAFM.hxx" #include "sft.hxx" @@ -108,8 +107,6 @@ inline sal_uInt32 getUInt32BE( const sal_uInt8*& pBuffer ) return nRet; } - - static FontWeight parseWeight( const OString& rWeight ) { FontWeight eWeight = WEIGHT_DONTKNOW; @@ -173,21 +170,15 @@ PrintFontManager::PrintFont::PrintFont( fonttype::type eType ) : { } - - PrintFontManager::PrintFont::~PrintFont() { delete m_pMetrics; } - - PrintFontManager::Type1FontFile::~Type1FontFile() { } - - PrintFontManager::TrueTypeFontFile::TrueTypeFontFile() : PrintFont( fonttype::TrueType ) , m_nDirectory( 0 ) @@ -195,21 +186,15 @@ PrintFontManager::TrueTypeFontFile::TrueTypeFontFile() , m_nTypeFlags( TYPEFLAG_INVALID ) {} - - PrintFontManager::TrueTypeFontFile::~TrueTypeFontFile() { } - - bool PrintFontManager::Type1FontFile::queryMetricPage( int /*nPage*/, MultiAtomProvider* pProvider ) { return readAfmMetrics( pProvider, false, false ); } - - bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomProvider* /*pProvider*/ ) { bool bSuccess = false; @@ -275,8 +260,6 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr return bSuccess; } - - /* #i73387# There seem to be fonts with a rather unwell chosen family name * consider e.g. "Helvetica Narrow" which defines its family as "Helvetica" * It can really only be distinguished by its PSName and FullName. Both of @@ -664,8 +647,6 @@ PrintFontManager& PrintFontManager::get() return *pManager; } - - /* * the PrintFontManager */ @@ -691,8 +672,6 @@ PrintFontManager::PrintFontManager() m_aFontInstallerTimer.SetTimeout(5000); } - - PrintFontManager::~PrintFontManager() { m_aFontInstallerTimer.Stop(); @@ -703,16 +682,12 @@ PrintFontManager::~PrintFontManager() delete m_pFontCache; } - - OString PrintFontManager::getDirectory( int nAtom ) const { ::boost::unordered_map< int, OString >::const_iterator it( m_aAtomToDir.find( nAtom ) ); return it != m_aAtomToDir.end() ? it->second : OString(); } - - int PrintFontManager::getDirectoryAtom( const OString& rDirectory, bool bCreate ) { int nAtom = 0; @@ -729,8 +704,6 @@ int PrintFontManager::getDirectoryAtom( const OString& rDirectory, bool bCreate return nAtom; } - - std::vector<fontID> PrintFontManager::addFontFile( const OString& rFileName ) { rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); @@ -919,8 +892,6 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, :: return ! rNewFonts.empty(); } - - fontID PrintFontManager::findFontFileID( int nDirID, const OString& rFontFile, int nFaceIndex ) const { fontID nID = 0; @@ -999,8 +970,6 @@ std::vector<fontID> PrintFontManager::findFontFileIDs( int nDirID, const OString return aIds; } - - OUString PrintFontManager::convertTrueTypeName( void* pRecord ) const { NameRecord* pNameRecord = (NameRecord*)pRecord; @@ -1085,8 +1054,6 @@ namespace } } - - void PrintFontManager::analyzeTrueTypeFamilyName( void* pTTFont, ::std::list< OUString >& rNames ) const { OUString aFamily; @@ -1140,8 +1107,6 @@ void PrintFontManager::analyzeTrueTypeFamilyName( void* pTTFont, ::std::list< OU return; } - - bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const { bool bSuccess = false; @@ -1436,7 +1401,6 @@ void PrintFontManager::initialize() aStep1 = times( &tms ); #endif - // part three - fill in family styles ::boost::unordered_map< fontID, PrintFont* >::iterator font_it; for (font_it = m_aFonts.begin(); font_it != m_aFonts.end(); ++font_it) @@ -1467,8 +1431,6 @@ void PrintFontManager::initialize() #endif } - - void PrintFontManager::getFontList( ::std::list< fontID >& rFontIDs ) { rFontIDs.clear(); @@ -1478,8 +1440,6 @@ void PrintFontManager::getFontList( ::std::list< fontID >& rFontIDs ) rFontIDs.push_back( it->first ); } - - void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& rInfo ) const { ::boost::unordered_map< int, FontFamily >::const_iterator style_it = @@ -1502,8 +1462,6 @@ void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& r rInfo.m_aAliases.push_back( m_pAtoms->getString( ATOM_FAMILYNAME, *it ) ); } - - void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo ) const { if( ( pFont->m_nAscend == 0 && pFont->m_nDescend == 0 ) || @@ -1525,8 +1483,6 @@ void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo rInfo.m_nWidth = pFont->m_aGlobalMetricX.width < pFont->m_aGlobalMetricY.width ? pFont->m_aGlobalMetricY.width : pFont->m_aGlobalMetricX.width; } - - bool PrintFontManager::getFontInfo( fontID nFontID, PrintFontInfo& rInfo ) const { PrintFont* pFont = getFont( nFontID ); @@ -1538,8 +1494,6 @@ bool PrintFontManager::getFontInfo( fontID nFontID, PrintFontInfo& rInfo ) const return pFont ? true : false; } - - bool PrintFontManager::getFontFastInfo( fontID nFontID, FastPrintFontInfo& rInfo ) const { PrintFont* pFont = getFont( nFontID ); @@ -1551,8 +1505,6 @@ bool PrintFontManager::getFontFastInfo( fontID nFontID, FastPrintFontInfo& rInfo return pFont ? true : false; } - - bool PrintFontManager::getFontBoundingBox( fontID nFontID, int& xMin, int& yMin, int& xMax, int& yMax ) { bool bSuccess = false; @@ -1576,8 +1528,6 @@ bool PrintFontManager::getFontBoundingBox( fontID nFontID, int& xMin, int& yMin, return bSuccess; } - - int PrintFontManager::getFontFaceNumber( fontID nFontID ) const { int nRet = 0; @@ -1589,9 +1539,6 @@ int PrintFontManager::getFontFaceNumber( fontID nFontID ) const return nRet; } - - - FontFamily PrintFontManager::matchFamilyName( const OUString& rFamily ) const { typedef struct { @@ -1657,8 +1604,6 @@ FontFamily PrintFontManager::matchFamilyName( const OUString& rFamily ) const return FAMILY_DONTKNOW; } - - OString PrintFontManager::getAfmFile( PrintFont* pFont ) const { OString aMetricPath; @@ -1680,8 +1625,6 @@ OString PrintFontManager::getAfmFile( PrintFont* pFont ) const return aMetricPath; } - - OString PrintFontManager::getFontFile( PrintFont* pFont ) const { OString aPath; @@ -1705,8 +1648,6 @@ OString PrintFontManager::getFontFile( PrintFont* pFont ) const return aPath; } - - const OUString& PrintFontManager::getPSName( fontID nFontID ) const { PrintFont* pFont = getFont( nFontID ); @@ -1774,8 +1715,6 @@ void PrintFontManager::hasVerticalSubstitutions( fontID nFontID, } } - - bool PrintFontManager::isFontDownloadingAllowedForPrinting( fontID nFont ) const { static const char* pEnable = getenv( "PSPRINT_ENABLE_TTF_COPYRIGHTAWARENESS" ); @@ -1812,8 +1751,6 @@ bool PrintFontManager::isFontDownloadingAllowedForPrinting( fontID nFont ) const return bRet; } - - bool PrintFontManager::getMetrics( fontID nFontID, const sal_Unicode* pString, int nLen, CharacterMetric* pArray, bool bVertical ) const { PrintFont* pFont = getFont( nFontID ); @@ -1855,8 +1792,6 @@ bool PrintFontManager::getMetrics( fontID nFontID, const sal_Unicode* pString, i return true; } - - bool PrintFontManager::getMetrics( fontID nFontID, sal_Unicode minCharacter, sal_Unicode maxCharacter, CharacterMetric* pArray, bool bVertical ) const { OSL_PRECOND(minCharacter <= maxCharacter, "invalid char. range"); @@ -1904,8 +1839,6 @@ bool PrintFontManager::getMetrics( fontID nFontID, sal_Unicode minCharacter, sal return true; } - - // TODO: move most of this stuff into the central font-subsetting code bool PrintFontManager::createFontSubset( FontSubsetInfo& rInfo, @@ -2137,8 +2070,6 @@ void PrintFontManager::getGlyphWidths( fontID nFont, } } - - const std::map< sal_Unicode, sal_Int32 >* PrintFontManager::getEncodingMap( fontID nFont, const std::map< sal_Unicode, OString >** pNonEncoded ) const { PrintFont* pFont = getFont( nFont ); @@ -2154,8 +2085,6 @@ const std::map< sal_Unicode, sal_Int32 >* PrintFontManager::getEncodingMap( font return pFont->m_aEncodingVector.size() ? &pFont->m_aEncodingVector : NULL; } - - std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aChar ) const { std::pair< boost::unordered_multimap< sal_Unicode, OString >::const_iterator, @@ -2176,7 +2105,6 @@ std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aCha return aRet; } - std::list< sal_Unicode > PrintFontManager::getUnicodeFromAdobeName( const OString& rName ) const { std::pair< boost::unordered_multimap< OString, sal_Unicode, OStringHash >::const_iterator, diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx index 4c10c9a63394..269fd9292719 100644 --- a/vcl/generic/fontmanager/fontsubst.cxx +++ b/vcl/generic/fontmanager/fontsubst.cxx @@ -35,10 +35,8 @@ #include <unotools/fontdefs.hxx> #include <list> - // platform specific font substitution hooks - struct FontSelectPatternAttributesHash { size_t operator()(const FontSelectPatternAttributes& rAttributes) const @@ -115,8 +113,6 @@ void SalGenericInstance::RegisterFontSubstitutors( PhysicalFontCollection* pFont } } - - static FontSelectPattern GetFcSubstitute(const FontSelectPattern &rFontSelData, OUString& rMissingCodes ) { FontSelectPattern aSubstituted(rFontSelData); @@ -153,8 +149,6 @@ namespace }; } - - bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelData ) const { // We don't actually want to talk to Fontconfig at all for symbol fonts @@ -220,8 +214,6 @@ bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelDa return bHaveSubstitute; } - - bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFontSelData, OUString& rMissingCodes ) const { @@ -263,7 +255,4 @@ bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFont return bHaveSubstitute; } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/generic/fontmanager/helper.cxx b/vcl/generic/fontmanager/helper.cxx index a35264f19b6b..7250964deb6b 100644 --- a/vcl/generic/fontmanager/helper.cxx +++ b/vcl/generic/fontmanager/helper.cxx @@ -382,5 +382,4 @@ void psp::splitPath( OString& rPath, OString& rDir, OString& rBase ) rBase = rPath.copy( nIndex+1 ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/generic/fontmanager/parseAFM.cxx b/vcl/generic/fontmanager/parseAFM.cxx index 1567c9e97657..8d5690e7120a 100644 --- a/vcl/generic/fontmanager/parseAFM.cxx +++ b/vcl/generic/fontmanager/parseAFM.cxx @@ -43,7 +43,6 @@ * in recognize() routine */ - /* parseAFM.c * * This file is used in conjuction with the parseAFM.h header file. @@ -290,7 +289,6 @@ static char *token( FileInputStream* stream, int& rLen ) } /* token */ - /*************************** linetoken *************************/ /* "linetoken" will get read all tokens until the EOL character from @@ -319,7 +317,6 @@ static char *linetoken( FileInputStream* stream ) } /* linetoken */ - /*************************** recognize *************************/ /* This function tries to match a string to a known list of @@ -349,7 +346,6 @@ static inline enum parseKey recognize( char* ident, int len) } /* recognize */ - /************************* parseGlobals *****************************/ /* This function is called by "parseFile". It will parse the AFM file @@ -555,7 +551,6 @@ static int parseGlobals( FileInputStream* fp, GlobalFontInfo* gfi ) } /* parseGlobals */ - /************************* parseCharWidths **************************/ /* This function is called by "parseFile". It will parse the AFM file @@ -668,7 +663,6 @@ static int parseCharWidths( FileInputStream* fp, int* cwi) } /* parseCharWidths */ - /* * number of char metrics is almost always inaccurate, so be gentle and try to * adapt our internal storage by adjusting the allocated list @@ -871,8 +865,6 @@ static int parseCharMetrics( FileInputStream* fp, FontInfo* fi) } /* parseCharMetrics */ - - /************************* parseTrackKernData ***********************/ /* This function is called by "parseFile". It will parse the AFM file @@ -980,7 +972,6 @@ static int parseTrackKernData( FileInputStream* fp, FontInfo* fi) } /* parseTrackKernData */ - /************************* parsePairKernData ************************/ /* This function is called by "parseFile". It will parse the AFM file @@ -1107,7 +1098,6 @@ static int parsePairKernData( FileInputStream* fp, FontInfo* fi) } /* parsePairKernData */ - /************************* parseCompCharData **************************/ /* This function is called by "parseFile". It will parse the AFM file @@ -1246,12 +1236,8 @@ static int parseCompCharData( FileInputStream* fp, FontInfo* fi) } /* parseCompCharData */ - - - /*************************** 'PUBLIC' FUNCTION ********************/ - /*************************** parseFile *****************************/ /* parseFile is the only 'public' procedure available. It is called @@ -1283,7 +1269,6 @@ int parseFile( const char* pFilename, FontInfo** fi, FLAGS flags) char *keyword; /* used to store a token */ - (*fi) = (FontInfo *) calloc(1, sizeof(FontInfo)); if ((*fi) == NULL) {error = storageProblem; return(error);} diff --git a/vcl/generic/fontmanager/parseAFM.hxx b/vcl/generic/fontmanager/parseAFM.hxx index 0c390bd8cf8d..f77f84a6ea4e 100644 --- a/vcl/generic/fontmanager/parseAFM.hxx +++ b/vcl/generic/fontmanager/parseAFM.hxx @@ -98,8 +98,6 @@ namespace psp { #define MAX_NAME 4096 /* max length for identifiers */ #define FLAGS int - - /* Flags that can be AND'ed together to specify exactly what * information from the AFM file should be saved. */ @@ -110,7 +108,6 @@ namespace psp { #define P_T 0x10 /* 0001 0000 */ /* Track Kerning Info */ #define P_C 0x20 /* 0010 0000 */ /* Composite Char Info */ - /* Commonly used flags */ #define P_GW (P_G | P_W) @@ -119,8 +116,6 @@ namespace psp { #define P_GMK (P_G | P_M | P_P | P_T) #define P_ALL (P_G | P_M | P_P | P_T | P_C) - - /* Possible return codes from the parseFile procedure. * * ok means there were no problems parsing the file. @@ -140,14 +135,12 @@ namespace psp { enum afmError { ok = 0, parseError = -1, earlyEOF = -2, storageProblem = -3 }; - /************************* TYPES *********************************/ /* Below are all of the data structure definitions. These structures * try to map as closely as possible to grouping and naming of data * in the AFM Files. */ - /* Bounding box definition. Used for the Font BBox as well as the * Character BBox. */ @@ -159,7 +152,6 @@ typedef struct int ury; /* upper right y-position */ } BBox; - /* Global Font information. * The key that each field is associated with is in comments. For an * explanation about each key and its value please refer to the AFM @@ -187,7 +179,6 @@ typedef struct int charwidth; /* key: CharWidth */ } GlobalFontInfo; - /* Ligature definition is a linked list since any character can have * any number of ligatures. */ @@ -197,7 +188,6 @@ typedef struct _t_ligature struct _t_ligature *next; } Ligature; - /* Character Metric Information. This structure is used only if ALL * character metric information is requested. If only the character * widths is requested, then only an array of the character x-widths @@ -219,7 +209,6 @@ typedef struct Ligature *ligs; /* key: L (linked list; not a fixed number of Ls */ } CharMetricInfo; - /* Track kerning data structure. * The fields of this record are the five values associated with every * TrackKern entry. @@ -237,7 +226,6 @@ typedef struct maxKernAmt; } TrackKernData; - /* Pair Kerning data structure. * The fields of this record are the four values associated with every * KP entry. For KPX entries, the yamt will be zero. @@ -254,7 +242,6 @@ typedef struct yamt; } PairKernData; - /* PCC is a piece of a composite character. This is a sub structure of a * compCharData described below. * These fields will be filled in with the values from the key PCC. @@ -270,7 +257,6 @@ typedef struct deltay; } Pcc; - /* Composite Character Information data structure. * The fields ccName and numOfPieces are filled with the values associated * with the key CC. The field pieces points to an array (size = numOfPieces) @@ -288,7 +274,6 @@ typedef struct Pcc *pieces; } CompCharData; - /* FontInfo * Record type containing pointers to all of the other data * structures containing information about a font. @@ -309,8 +294,6 @@ typedef struct CompCharData *ccd; /* ptr to comp char array */ } FontInfo; - - /************************* PROCEDURES ****************************/ /* Call this procedure to do the grunt work of parsing an AFM file. diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 92da831181eb..ab5ddd8afa7b 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "gcach_ftyp.hxx" #include "vcl/svapp.hxx" @@ -89,8 +88,6 @@ static void InitGammaTable() } } - - static FT_Library aLibFT = 0; // enable linking with old FT versions @@ -100,8 +97,6 @@ typedef ::boost::unordered_map<const char*, boost::shared_ptr<FtFontFile>, rtl:: namespace { struct vclFontFileList : public rtl::Static< FontFileList, vclFontFileList > {}; } - - // TODO: remove when the priorities are selected by UI // if (AH==0) => disable autohinting // if (AA==0) => disable antialiasing @@ -113,10 +108,8 @@ static int nDefaultPrioEmbedded = 2; static int nDefaultPrioAutoHint = 1; static int nDefaultPrioAntiAlias = 1; - // FreetypeManager - FtFontFile::FtFontFile( const OString& rNativeFileName ) : maNativeFileName( rNativeFileName ), mpFileMap( NULL ), @@ -143,8 +136,6 @@ FtFontFile::FtFontFile( const OString& rNativeFileName ) } } - - FtFontFile* FtFontFile::FindFontFile( const OString& rNativeFileName ) { // font file already known? (e.g. for ttc, synthetic, aliased fonts) @@ -161,8 +152,6 @@ FtFontFile* FtFontFile::FindFontFile( const OString& rNativeFileName ) return pFontFile; } - - bool FtFontFile::Map() { if( mnRefCount++ <= 0 ) @@ -190,8 +179,6 @@ bool FtFontFile::Map() return (mpFileMap != NULL); } - - void FtFontFile::Unmap() { if( (--mnRefCount > 0) || (mpFileMap == NULL) ) @@ -228,8 +215,6 @@ const void * graphiteFontTable(const void* appFaceHandle, unsigned int name, siz } #endif - - FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes, const OString& rNativeFileName, int nFaceNum, sal_IntPtr nFontId, int nSynthetic) : @@ -254,8 +239,6 @@ FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes, maDevFontAttributes.mnQuality += mpFontFile->GetLangBoost(); } - - FtFontInfo::~FtFontInfo() { if( mpFontCharMap ) @@ -274,8 +257,6 @@ void FtFontInfo::InitHashes() const mpGlyph2Char = new Int2IntMap(); } - - FT_FaceRec_* FtFontInfo::GetFaceFT() { if (!maFaceFT && mpFontFile->Map()) @@ -314,8 +295,6 @@ GraphiteFaceWrapper * FtFontInfo::GetGraphiteFace() } #endif - - void FtFontInfo::ReleaseFaceFT() { if (--mnRefCount <= 0) @@ -326,8 +305,6 @@ void FtFontInfo::ReleaseFaceFT() } } - - static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);} static unsigned GetUShort( const unsigned char* p ){ return((p[0]<<8)+p[1]);} //static signed GetSShort( const unsigned char* p ){ return((short)((p[0]<<8)+p[1]));} @@ -372,16 +349,12 @@ const unsigned char* FtFontInfo::GetTable( const char* pTag, sal_uLong* pLength return NULL; } - - void FtFontInfo::AnnounceFont( PhysicalFontCollection* pFontCollection ) { ImplFTSFontData* pFD = new ImplFTSFontData( this, maDevFontAttributes ); pFontCollection->Add( pFD ); } - - FreetypeManager::FreetypeManager() : mnMaxFontId( 0 ) { @@ -407,8 +380,6 @@ FreetypeManager::FreetypeManager() vclFontFileList::get(); } - - FT_Face ServerFont::GetFtFace() const { FT_Activate_Size( maSizeFT ); @@ -416,15 +387,11 @@ FT_Face ServerFont::GetFtFace() const return maFaceFT; } - - FreetypeManager::~FreetypeManager() { ClearFontList(); } - - void FreetypeManager::AddFontFile( const OString& rNormalizedName, int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes& rDevFontAttr) { @@ -441,8 +408,6 @@ void FreetypeManager::AddFontFile( const OString& rNormalizedName, mnMaxFontId = nFontId; } - - void FreetypeManager::AnnounceFonts( PhysicalFontCollection* pToAdd ) const { for( FontList::const_iterator it = maFontList.begin(); it != maFontList.end(); ++it ) @@ -452,8 +417,6 @@ void FreetypeManager::AnnounceFonts( PhysicalFontCollection* pToAdd ) const } } - - void FreetypeManager::ClearFontList( ) { for( FontList::iterator it = maFontList.begin(); it != maFontList.end(); ++it ) @@ -464,8 +427,6 @@ void FreetypeManager::ClearFontList( ) maFontList.clear(); } - - ServerFont* FreetypeManager::CreateFont( const FontSelectPattern& rFSD ) { FtFontInfo* pFontInfo = NULL; @@ -484,8 +445,6 @@ ServerFont* FreetypeManager::CreateFont( const FontSelectPattern& rFSD ) return pNew; } - - ImplFTSFontData::ImplFTSFontData( FtFontInfo* pFI, const ImplDevFontAttributes& rDFA ) : PhysicalFontFace( rDFA, IFTSFONT_MAGIC ), mpFtFontInfo( pFI ) @@ -494,18 +453,14 @@ ImplFTSFontData::ImplFTSFontData( FtFontInfo* pFI, const ImplDevFontAttributes& mbOrientation = true; } - - ImplFontEntry* ImplFTSFontData::CreateFontInstance( FontSelectPattern& rFSD ) const { ImplServerFontEntry* pEntry = new ImplServerFontEntry( rFSD ); return pEntry; } - // ServerFont - ServerFont::ServerFont( const FontSelectPattern& rFSD, FtFontInfo* pFI ) : maGlyphList( 0), maFontSelData(rFSD), @@ -668,8 +623,6 @@ bool ServerFont::TestFont() const return mbFaceOk; } - - ServerFont::~ServerFont() { if( mpLayoutEngine ) @@ -683,15 +636,11 @@ ServerFont::~ServerFont() ReleaseFromGarbageCollect(); } - - int ServerFont::GetEmUnits() const { return maFaceFT->units_per_EM; } - - void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const { static_cast<ImplFontAttributes&>(rTo) = mpFontInfo->GetFontAttributes(); @@ -814,8 +763,6 @@ void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const } } - - static inline void SplitGlyphFlags( const ServerFont& rFont, sal_GlyphId& rGlyphId, int& nGlyphFlags ) { nGlyphFlags = rGlyphId & GF_FLAGMASK; @@ -825,8 +772,6 @@ static inline void SplitGlyphFlags( const ServerFont& rFont, sal_GlyphId& rGlyph rGlyphId = rFont.GetRawGlyphIndex( rGlyphId ); } - - int ServerFont::ApplyGlyphTransform( int nGlyphFlags, FT_Glyph pGlyphFT, bool bForBitmapProcessing ) const { @@ -900,8 +845,6 @@ int ServerFont::ApplyGlyphTransform( int nGlyphFlags, return nAngle; } - - sal_GlyphId ServerFont::GetRawGlyphIndex(sal_UCS4 aChar, sal_UCS4 aVS) const { if( mpFontInfo->IsSymbolFont() ) @@ -945,8 +888,6 @@ sal_GlyphId ServerFont::GetRawGlyphIndex(sal_UCS4 aChar, sal_UCS4 aVS) const return sal_GlyphId( nGlyphIndex); } - - sal_GlyphId ServerFont::FixupGlyphIndex( sal_GlyphId aGlyphId, sal_UCS4 aChar ) const { int nGlyphFlags = GF_NONE; @@ -981,9 +922,6 @@ sal_GlyphId ServerFont::FixupGlyphIndex( sal_GlyphId aGlyphId, sal_UCS4 aChar ) return aGlyphId; } - - - sal_GlyphId ServerFont::GetGlyphIndex( sal_UCS4 aChar ) const { sal_GlyphId aGlyphId = GetRawGlyphIndex( aChar ); @@ -991,8 +929,6 @@ sal_GlyphId ServerFont::GetGlyphIndex( sal_UCS4 aChar ) const return aGlyphId; } - - static int lcl_GetCharWidth( FT_FaceRec_* pFaceFT, double fStretch, int nGlyphFlags ) { int nCharWidth = pFaceFT->glyph->metrics.horiAdvance; @@ -1006,8 +942,6 @@ static int lcl_GetCharWidth( FT_FaceRec_* pFaceFT, double fStretch, int nGlyphFl return (nCharWidth + 32) >> 6; } - - void ServerFont::InitGlyphData( sal_GlyphId aGlyphId, GlyphData& rGD ) const { FT_Activate_Size( maSizeFT ); @@ -1058,8 +992,6 @@ void ServerFont::InitGlyphData( sal_GlyphId aGlyphId, GlyphData& rGD ) const FT_Done_Glyph( pGlyphFT ); } - - bool ServerFont::GetAntialiasAdvice( void ) const { if( GetFontSelData().mbNonAntialiased || (mnPrioAntiAlias<=0) ) @@ -1069,8 +1001,6 @@ bool ServerFont::GetAntialiasAdvice( void ) const return bAdviseAA; } - - bool ServerFont::GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) const { FT_Activate_Size( maSizeFT ); @@ -1210,8 +1140,6 @@ bool ServerFont::GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) return true; } - - bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) const { FT_Activate_Size( maSizeFT ); @@ -1342,10 +1270,8 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) return true; } - // determine unicode ranges in font - const ImplFontCharMap* ServerFont::GetImplFontCharMap( void ) const { const ImplFontCharMap* pIFCMap = mpFontInfo->GetImplFontCharMap(); @@ -1442,10 +1368,8 @@ bool ServerFont::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) c return bRet; } - // outline stuff - class PolyArgs { public: @@ -1471,8 +1395,6 @@ private: bool bHasOffline; }; - - PolyArgs::PolyArgs( PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints ) : mrPolyPoly(rPolyPoly), mnMaxPoints(nMaxPoints), @@ -1485,17 +1407,12 @@ PolyArgs::PolyArgs( PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints ) maPosition.x = maPosition.y = 0; } - - - PolyArgs::~PolyArgs() { delete[] mpFlagAry; delete[] mpPointAry; } - - void PolyArgs::AddPoint( long nX, long nY, PolyFlags aFlag ) { DBG_ASSERT( (mnPoints < mnMaxPoints), "FTGlyphOutline: AddPoint overflow!" ); @@ -1509,8 +1426,6 @@ void PolyArgs::AddPoint( long nX, long nY, PolyFlags aFlag ) bHasOffline |= (aFlag != POLY_NORMAL); } - - void PolyArgs::ClosePolygon() { if( !mnPoly++ ) @@ -1555,8 +1470,6 @@ void PolyArgs::ClosePolygon() bHasOffline = false; } - - extern "C" { // TODO: wait till all compilers accept that calling conventions @@ -1608,8 +1521,6 @@ static int FT_cubic_to( FT_Vector_CPtr p1, FT_Vector_CPtr p2, FT_Vector_CPtr p3, } // extern "C" - - bool ServerFont::GetGlyphOutline( sal_GlyphId aGlyphId, ::basegfx::B2DPolyPolygon& rB2DPolyPoly ) const { @@ -1686,8 +1597,6 @@ bool ServerFont::GetGlyphOutline( sal_GlyphId aGlyphId, return true; } - - bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD ) { #define MKTAG(s) ((((((s[0]<<8)+s[1])<<8)+s[2])<<8)+s[3]) @@ -1943,6 +1852,4 @@ GraphiteFaceWrapper* ServerFont::GetGraphiteFace() const } #endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx index 7015b343f960..7babff34e085 100644 --- a/vcl/generic/glyphs/gcach_ftyp.hxx +++ b/vcl/generic/glyphs/gcach_ftyp.hxx @@ -28,8 +28,6 @@ class GraphiteFaceWrapper; #endif - - // FtFontFile has the responsibility that a font file is only mapped once. // (#86621#) the old directly ft-managed solution caused it to be mapped // in up to nTTC*nSizes*nOrientation*nSynthetic times @@ -56,8 +54,6 @@ private: int mnLangBoost; }; - - // FtFontInfo corresponds to an unscaled font face class FtFontInfo { @@ -133,8 +129,6 @@ inline void FtFontInfo::CacheGlyphIndex( sal_UCS4 cChar, int nIndex ) const (*mpGlyph2Char)[ nIndex ] = cChar; } - - class FreetypeManager { public: @@ -155,8 +149,6 @@ private: sal_IntPtr mnMaxFontId; }; - - class ImplFTSFontData : public PhysicalFontFace { private: @@ -175,8 +167,6 @@ public: static bool CheckFontData( const PhysicalFontFace& r ) { return r.CheckMagic( IFTSFONT_MAGIC ); } }; - - #endif // INCLUDED_VCL_GENERIC_GLYPHS_GCACH_FTYP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index dfbd653224a2..ff644e34c00f 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -38,10 +38,8 @@ #include <com/sun/star/i18n/CharacterIteratorMode.hpp> #include <comphelper/processfactory.hxx> - // layout implementation for ServerFont - ServerFontLayout::ServerFontLayout( ServerFont& rFont ) : mrServerFont( rFont ) { } @@ -51,14 +49,11 @@ void ServerFontLayout::DrawText( SalGraphics& rSalGraphics ) const rSalGraphics.DrawServerFontLayout( *this ); } - - bool ServerFontLayout::LayoutText( ImplLayoutArgs& rArgs ) { return mrServerFont.GetLayoutEngine()->layout(*this, rArgs); } - void ServerFontLayout::AdjustLayout( ImplLayoutArgs& rArgs ) { GenericSalLayout::AdjustLayout( rArgs ); @@ -115,8 +110,6 @@ void ServerFontLayout::setNeedFallback(ImplLayoutArgs& rArgs, sal_Int32 nCharPos rArgs.NeedFallback(nGraphemeStartPos, nGraphemeEndPos, bRightToLeft); } - - std::ostream &operator <<(std::ostream& s, ServerFont* pFont) { #ifndef SAL_LOG_INFO @@ -553,8 +546,6 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs) return true; } - - ServerFontLayoutEngine* ServerFont::GetLayoutEngine() { // find best layout engine for font, platform, script and language @@ -564,6 +555,4 @@ ServerFontLayoutEngine* ServerFont::GetLayoutEngine() return mpLayoutEngine; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/generic/glyphs/gcach_rbmp.cxx b/vcl/generic/glyphs/gcach_rbmp.cxx index 0efe54cef3e0..23d3ed9abe75 100644 --- a/vcl/generic/glyphs/gcach_rbmp.cxx +++ b/vcl/generic/glyphs/gcach_rbmp.cxx @@ -17,20 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "generic/glyphcache.hxx" #include <string.h> - RawBitmap::RawBitmap() : mnAllocated(0) {} - RawBitmap::~RawBitmap() {} - // used by 90 and 270 degree rotations on 8 bit deep bitmaps static void ImplRotate8_90( unsigned char* p1, const unsigned char* p2, int xmax, int ymax, int dx, int dy, int nPad ) @@ -44,7 +40,6 @@ static void ImplRotate8_90( unsigned char* p1, const unsigned char* p2, } } - // used by inplace 180 degree rotation on 8 bit deep bitmaps static void ImplRotate8_180( unsigned char* p1, int xmax, int ymax, int nPad ) { @@ -71,7 +66,6 @@ static void ImplRotate8_180( unsigned char* p1, int xmax, int ymax, int nPad ) } } - // used by 90 or 270 degree rotations on 1 bit deep bitmaps static void ImplRotate1_90( unsigned char* p1, const unsigned char* p2, int xmax, int ymax, int dx, int nShift, int nDeltaShift, int nPad ) @@ -110,7 +104,6 @@ static void ImplRotate1_90( unsigned char* p1, const unsigned char* p2, } } - // used by 180 degrees rotations on 1 bit deep bitmaps static void ImplRotate1_180( unsigned char* p1, const unsigned char* p2, int xmax, int ymax, int nPad ) @@ -147,7 +140,6 @@ static void ImplRotate1_180( unsigned char* p1, const unsigned char* p2, } } - bool RawBitmap::Rotate( int nAngle ) { sal_uLong nNewScanlineSize = 0; diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx index 7c7e2d15d8fc..2509c00bdb54 100644 --- a/vcl/generic/glyphs/glyphcache.cxx +++ b/vcl/generic/glyphs/glyphcache.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <stdlib.h> #include <math.h> @@ -51,14 +50,12 @@ GlyphCache::GlyphCache( GlyphCachePeer& rPeer ) mpFtManager = new FreetypeManager; } - GlyphCache::~GlyphCache() { InvalidateAllGlyphs(); delete mpFtManager; } - void GlyphCache::InvalidateAllGlyphs() { for( FontList::iterator it = maFontList.begin(), end = maFontList.end(); it != end; ++it ) @@ -72,7 +69,6 @@ void GlyphCache::InvalidateAllGlyphs() mpCurrentGCFont = NULL; } - inline size_t GlyphCache::IFSD_Hash::operator()( const FontSelectPattern& rFontSelData ) const { @@ -98,7 +94,6 @@ size_t GlyphCache::IFSD_Hash::operator()( const FontSelectPattern& rFontSelData return nHash; } - bool GlyphCache::IFSD_Equal::operator()( const FontSelectPattern& rA, const FontSelectPattern& rB) const { // check font ids @@ -146,13 +141,11 @@ bool GlyphCache::IFSD_Equal::operator()( const FontSelectPattern& rA, const Font return true; } - GlyphCache& GlyphCache::GetInstance() { return *pInstance; } - void GlyphCache::AddFontFile( const OString& rNormalizedName, int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes& rDFA) { @@ -160,7 +153,6 @@ void GlyphCache::AddFontFile( const OString& rNormalizedName, int nFaceNum, mpFtManager->AddFontFile( rNormalizedName, nFaceNum, nFontId, rDFA); } - void GlyphCache::AnnounceFonts( PhysicalFontCollection* pFontCollection ) const { if( mpFtManager ) @@ -174,7 +166,6 @@ void GlyphCache::ClearFontCache() mpFtManager->ClearFontList(); } - ServerFont* GlyphCache::CacheFont( const FontSelectPattern& rFontSelData ) { // a serverfont request has pFontData @@ -226,7 +217,6 @@ ServerFont* GlyphCache::CacheFont( const FontSelectPattern& rFontSelData ) return pNew; } - void GlyphCache::UncacheFont( ServerFont& rServerFont ) { // the interface for rServerFont must be const because a @@ -241,7 +231,6 @@ void GlyphCache::UncacheFont( ServerFont& rServerFont ) } } - void GlyphCache::GarbageCollect() { // when current GC font has been destroyed get another one @@ -292,13 +281,11 @@ void GlyphCache::GarbageCollect() } } - inline void GlyphCache::UsingGlyph( ServerFont&, GlyphData& rGlyphData ) { rGlyphData.SetLruValue( mnLruIndex++ ); } - inline void GlyphCache::AddedGlyph( ServerFont& rServerFont, GlyphData& rGlyphData ) { ++mnGlyphCount; @@ -307,14 +294,12 @@ inline void GlyphCache::AddedGlyph( ServerFont& rServerFont, GlyphData& rGlyphDa GrowNotify(); } - void GlyphCache::GrowNotify() { if( (mnBytesUsed + mrPeer.GetByteCount()) > mnMaxSize ) GarbageCollect(); } - inline void GlyphCache::RemovingGlyph( GlyphData& rGD ) { mrPeer.RemovingGlyph( rGD ); @@ -322,7 +307,6 @@ inline void GlyphCache::RemovingGlyph( GlyphData& rGD ) --mnGlyphCount; } - void ServerFont::ReleaseFromGarbageCollect() { // remove from GC list @@ -334,14 +318,12 @@ void ServerFont::ReleaseFromGarbageCollect() mpNextGCFont = NULL; } - long ServerFont::Release() const { DBG_ASSERT( mnRefCount > 0, "ServerFont: RefCount underflow" ); return --mnRefCount; } - GlyphData& ServerFont::GetGlyphData( sal_GlyphId aGlyphId ) { // usually the GlyphData is cached @@ -360,7 +342,6 @@ GlyphData& ServerFont::GetGlyphData( sal_GlyphId aGlyphId ) return rGlyphData; } - void ServerFont::GarbageCollect( long nMinLruIndex ) { GlyphList::iterator it = maGlyphList.begin(); @@ -379,14 +360,12 @@ void ServerFont::GarbageCollect( long nMinLruIndex ) } } - ImplServerFontEntry::ImplServerFontEntry( FontSelectPattern& rFSD ) : ImplFontEntry( rFSD ) , mpServerFont( NULL ) , mbGotFontOptions( false ) {} - void ImplServerFontEntry::SetServerFont(ServerFont* p) { if (p == mpServerFont) diff --git a/vcl/generic/glyphs/graphite_serverfont.cxx b/vcl/generic/glyphs/graphite_serverfont.cxx index e2f50852d124..09159e4d985b 100644 --- a/vcl/generic/glyphs/graphite_serverfont.cxx +++ b/vcl/generic/glyphs/graphite_serverfont.cxx @@ -19,7 +19,6 @@ // Header files - // Platform #include <i18nlangtag/languagetag.hxx> #include <sallayout.hxx> @@ -41,10 +40,8 @@ float freetypeServerFontAdvance(const void* appFontHandle, gr_uint16 glyphId) return .0f; } - // An implementation of the GraphiteLayout interface to enable Graphite enabled fonts to be used. - GraphiteServerFontLayout::GraphiteServerFontLayout(ServerFont& rServerFont) throw() : ServerFontLayout(rServerFont), maImpl(rServerFont.GetGraphiteFace()->face(), rServerFont) diff --git a/vcl/generic/glyphs/scrptrun.h b/vcl/generic/glyphs/scrptrun.h index 72975464a38e..38302e1413d8 100644 --- a/vcl/generic/glyphs/scrptrun.h +++ b/vcl/generic/glyphs/scrptrun.h @@ -176,5 +176,4 @@ inline void ScriptRun::reset(const UChar chars[], int32_t start, int32_t length) reset(start, length); } - #endif diff --git a/vcl/generic/print/bitmap_gfx.cxx b/vcl/generic/print/bitmap_gfx.cxx index e3f6f44e1e4f..4b7017b6b70f 100644 --- a/vcl/generic/print/bitmap_gfx.cxx +++ b/vcl/generic/print/bitmap_gfx.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "psputil.hxx" #include "generic/printergfx.hxx" diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx index 3b1f87e88ebb..c5cc108c5e8e 100644 --- a/vcl/generic/print/common_gfx.cxx +++ b/vcl/generic/print/common_gfx.cxx @@ -436,7 +436,6 @@ PrinterGfx::DrawPolyPolygon (sal_uInt32 nPoly, const sal_uInt32* pSizes, const P if ( !nPoly || !pPaths || !(maFillColor.Is() || maLineColor.Is())) return; - // setup closed path for( unsigned int i = 0; i < nPoly; i++ ) { @@ -597,7 +596,6 @@ PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints, if ( !nPoly || !pPtAry || !pPoints || !(maFillColor.Is() || maLineColor.Is())) return; - for (unsigned int i=0; i<nPoly;i++) { sal_uInt32 nPoints = pPoints[i]; @@ -654,7 +652,6 @@ PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints, PSGRestore(); } - /* * postscript generating routines */ diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index d6e891192e2e..12ffe7a1f03b 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - /** this file implements the sal printer interface ( SalPrinter, SalInfoPrinter and some printer relevant methods of SalInstance and SalGraphicsData ) @@ -64,7 +63,6 @@ using namespace psp; using namespace com::sun::star; - /* * static helpers */ @@ -717,7 +715,6 @@ void PspSalInfoPrinter::GetPageInfo( int left = 0, top = 0, right = 0, bottom = 0; int nDPI = aData.m_aContext.getRenderResolution(); - if( aData.m_eOrientation == psp::orientation::Portrait ) { aData.m_aContext.getPageSize( aPaper, width, height ); @@ -1268,7 +1265,6 @@ bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJo return true; } - class PrinterUpdate { static Timer* pPrinterUpdateTimer; @@ -1293,8 +1289,6 @@ void PrinterUpdate::doUpdate() pInst->PostPrintersChanged(); } - - IMPL_STATIC_LINK_NOINSTANCE( PrinterUpdate, UpdateTimerHdl, void*, EMPTYARG ) { if( nActiveJobs < 1 ) diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index 5a6aecd5b2eb..33846e2f88c3 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -58,7 +58,6 @@ using namespace psp; - // ----- Implementation of PrinterBmp by means of SalBitmap/BitmapBuffer --------------- class SalPrinterBmp : public psp::PrinterBmp @@ -558,8 +557,6 @@ void GenPspGraphics::invert(long,long,long,long,SalInvert) OSL_FAIL("Warning: PrinterGfx::Invert() not implemented"); } - - class ImplPspFontData : public PhysicalFontFace { private: @@ -574,23 +571,17 @@ public: static bool CheckFontData( const PhysicalFontFace& r ) { return r.CheckMagic( PSPFD_MAGIC ); } }; - - ImplPspFontData::ImplPspFontData( const psp::FastPrintFontInfo& rInfo ) : PhysicalFontFace( GenPspGraphics::Info2DevFontAttributes(rInfo), PSPFD_MAGIC ), mnFontId( rInfo.m_nID ) {} - - ImplFontEntry* ImplPspFontData::CreateFontInstance( FontSelectPattern& rFSD ) const { ImplServerFontEntry* pEntry = new ImplServerFontEntry( rFSD ); return pEntry; } - - class PspFontLayout : public GenericSalLayout { public: @@ -608,8 +599,6 @@ private: bool mbArtBold; }; - - PspFontLayout::PspFontLayout( ::psp::PrinterGfx& rGfx ) : mrPrinterGfx( rGfx ) { @@ -621,8 +610,6 @@ PspFontLayout::PspFontLayout( ::psp::PrinterGfx& rGfx ) mbArtBold = mrPrinterGfx.GetArtificialBold(); } - - bool PspFontLayout::LayoutText( ImplLayoutArgs& rArgs ) { mbVertical = ((rArgs.mnFlags & SAL_LAYOUT_VERTICAL) != 0); @@ -721,8 +708,6 @@ void PspServerFontLayout::InitFont() const mnOrientation, mbVertical, mbArtItalic, mbArtBold ); } - - static void DrawPrinterLayout( const SalLayout& rLayout, ::psp::PrinterGfx& rGfx, bool bIsPspServerFontLayout ) { const int nMaxGlyphs = 200; @@ -778,16 +763,12 @@ static void DrawPrinterLayout( const SalLayout& rLayout, ::psp::PrinterGfx& rGfx } } - - void PspFontLayout::InitFont() const { mrPrinterGfx.SetFont( mnFontID, mnFontHeight, mnFontWidth, mnOrientation, mbVertical, mbArtItalic, mbArtBold ); } - - void PspFontLayout::DrawText( SalGraphics& ) const { DrawPrinterLayout( *this, mrPrinterGfx, false ); @@ -1002,8 +983,6 @@ SalLayout* GenPspGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe return pLayout; } - - bool GenPspGraphics::CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, @@ -1032,8 +1011,6 @@ bool GenPspGraphics::CreateFontSubset( return bSuccess; } - - const Ucs2SIntMap* GenPspGraphics::GetFontEncodingVector( const PhysicalFontFace* pFont, const Ucs2OStrMap** pNonEncoded ) { // in this context the pFont->GetFontId() is a valid PSP @@ -1045,8 +1022,6 @@ const Ucs2SIntMap* GenPspGraphics::GetFontEncodingVector( const PhysicalFontFace return GenPspGraphics::DoGetFontEncodingVector( aFont, pNonEncoded ); } - - void GenPspGraphics::GetGlyphWidths( const PhysicalFontFace* pFont, bool bVertical, Int32Vector& rWidths, @@ -1085,7 +1060,6 @@ void GenPspGraphics::DoGetGlyphWidths( psp::fontID aFont, rMgr.getGlyphWidths( aFont, bVertical, rWidths, rUnicodeEnc ); } - ImplDevFontAttributes GenPspGraphics::Info2DevFontAttributes( const psp::FastPrintFontInfo& rInfo ) { ImplDevFontAttributes aDFA; @@ -1161,8 +1135,6 @@ namespace vcl } } - - void GenPspGraphics::AnnounceFonts( PhysicalFontCollection* pFontCollection, const psp::FastPrintFontInfo& aInfo ) { int nQuality = 0; @@ -1215,7 +1187,6 @@ bool GenPspGraphics::drawTransformedBitmap( return false; } - bool GenPspGraphics::drawAlphaRect( long, long, long, long, sal_uInt8 ) { return false; diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx index adf08a3cd34f..9a87b7e26c62 100644 --- a/vcl/generic/print/glyphset.cxx +++ b/vcl/generic/print/glyphset.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "glyphset.hxx" #include "psputil.hxx" @@ -43,7 +42,6 @@ using namespace vcl; using namespace psp; - GlyphSet::GlyphSet (sal_Int32 nFontID, bool bVertical) : mnFontID (nFontID), mbVertical (bVertical) diff --git a/vcl/generic/print/glyphset.hxx b/vcl/generic/print/glyphset.hxx index f5cec42d9c0e..d8cd49d22be3 100644 --- a/vcl/generic/print/glyphset.hxx +++ b/vcl/generic/print/glyphset.hxx @@ -118,7 +118,6 @@ public: bool PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAsType42, std::list< OString >& rSuppliedFonts ); }; - } /* namespace psp */ #endif diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx index 9575169fb1fe..48d996729e73 100644 --- a/vcl/generic/print/printerjob.cxx +++ b/vcl/generic/print/printerjob.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <sys/types.h> #include <sys/stat.h> @@ -47,7 +46,6 @@ using namespace psp; - // forward declaration #define nBLOCKSIZE 0x2000 @@ -580,7 +578,6 @@ PrinterJob::InitPaperSize (const JobData& rJobSetup) mfYScale = -1.0 * (double)72.0 / (double)mnResolution; } - bool PrinterJob::StartPage (const JobData& rJobSetup) { diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx index 32f4c6ccc7ab..ea93c2df1abf 100644 --- a/vcl/generic/print/prtsetup.cxx +++ b/vcl/generic/print/prtsetup.cxx @@ -67,8 +67,6 @@ void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, con rBox.SelectEntry( m_aInvalidString ); } - - /* * RTSDialog */ @@ -128,8 +126,6 @@ IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl ) return 0; } - - IMPL_LINK( RTSDialog, ClickButton, Button*, pButton ) { if( pButton == m_pOKButton ) @@ -156,8 +152,6 @@ IMPL_LINK( RTSDialog, ClickButton, Button*, pButton ) return 0; } - - /* * RTSPaperPage */ @@ -194,14 +188,10 @@ RTSPaperPage::RTSPaperPage(RTSDialog* pParent) update(); } - - RTSPaperPage::~RTSPaperPage() { } - - void RTSPaperPage::update() { const PPDKey* pKey = NULL; @@ -247,8 +237,6 @@ void RTSPaperPage::update() } } - - IMPL_LINK( RTSPaperPage, SelectHdl, ListBox*, pBox ) { const PPDKey* pKey = NULL; @@ -281,8 +269,6 @@ IMPL_LINK( RTSPaperPage, SelectHdl, ListBox*, pBox ) return 0; } - - /* * RTSDevicePage */ @@ -371,14 +357,10 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) } } - - RTSDevicePage::~RTSDevicePage() { } - - void RTSDevicePage::update() { } @@ -407,8 +389,6 @@ sal_uLong RTSDevicePage::getColorDevice() return 0; } - - sal_uLong RTSDevicePage::getLevel() { sal_uLong nLevel = (sal_uLong)m_pLevelBox->GetEntryData( m_pLevelBox->GetSelectEntryPos() ); @@ -417,8 +397,6 @@ sal_uLong RTSDevicePage::getLevel() return nLevel < 10 ? nLevel-1 : 0; } - - sal_uLong RTSDevicePage::getPDFDevice() { sal_uLong nLevel = (sal_uLong)m_pLevelBox->GetEntryData( m_pLevelBox->GetSelectEntryPos() ); diff --git a/vcl/generic/print/psputil.cxx b/vcl/generic/print/psputil.cxx index 3c409d9c6e57..9d47556fb3d4 100644 --- a/vcl/generic/print/psputil.cxx +++ b/vcl/generic/print/psputil.cxx @@ -89,7 +89,6 @@ getAlignedHexValueOf (sal_Int32 nValue, sal_Char* pBuffer) return nRet; } - sal_Int32 getValueOf (sal_Int32 nValue, sal_Char* pBuffer) { @@ -245,7 +244,6 @@ ConverterFactory& GetConverterFactory() return theConverterFactory::get(); } - } /* namespace psp */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx index 71662cf58ac6..40a7dad60558 100644 --- a/vcl/generic/print/text_gfx.cxx +++ b/vcl/generic/print/text_gfx.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <math.h> #include "psputil.hxx" diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index e7c458c3f96c..de7d3ad3315e 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -69,7 +69,6 @@ bool SvpSalGraphics::drawAlphaBitmap( const SalTwoRect&, const SalBitmap& /*rSou return false; } - bool SvpSalGraphics::drawTransformedBitmap( const basegfx::B2DPoint& rNull, const basegfx::B2DPoint& rX, @@ -82,7 +81,6 @@ bool SvpSalGraphics::drawTransformedBitmap( return false; } - bool SvpSalGraphics::drawAlphaRect( long /*nX*/, long /*nY*/, long /*nWidth*/, long /*nHeight*/, sal_uInt8 /*nTransparency*/ ) { // TODO(P3) implement alpha blending @@ -164,7 +162,6 @@ void SvpSalGraphics::ResetClipRegion() m_aClipRegion.SetNull(); } - // verify clip for the whole area is setup void SvpSalGraphics::ensureClip() { @@ -375,7 +372,6 @@ void SvpSalGraphics::SetROPFillColor( SalROPColor nROPColor ) } } - void SvpSalGraphics::drawPixel( long nX, long nY ) { if( m_bUseLineColor ) diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx index d0ee938de0c0..eaba04bf8713 100644 --- a/vcl/headless/svpprn.cxx +++ b/vcl/headless/svpprn.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/svapp.hxx" #include "vcl/timer.hxx" #include "vcl/printerinfomanager.hxx" @@ -180,7 +179,6 @@ SalInfoPrinter* SvpSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueIn copyJobDataToJobSetup( pJobSetup, aInfo ); } - return pPrinter; } diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx index 2dd140ac14a8..49b1464b09c7 100644 --- a/vcl/headless/svptext.cxx +++ b/vcl/headless/svptext.cxx @@ -111,7 +111,6 @@ SvpGlyphCache& SvpGlyphCache::GetInstance() return theGlyphCacheHolder::get().getGlyphCache(); } - BitmapDeviceSharedPtr SvpGlyphPeer::GetGlyphBmp( ServerFont& rServerFont, sal_GlyphId aGlyphId, basebmp::Format nBmpFormat, B2IPoint& rTargetPos ) { @@ -172,13 +171,11 @@ BitmapDeviceSharedPtr SvpGlyphPeer::GetGlyphBmp( ServerFont& rServerFont, return pGcpHelper->maBitmapDev; } - void SvpGlyphPeer::RemovingFont( ServerFont& ) { // nothing to do: no font resources held in SvpGlyphPeer } - void SvpGlyphPeer::RemovingGlyph( GlyphData& rGlyphData ) { SvpGcpHelper* pGcpHelper = static_cast<SvpGcpHelper*>( @@ -222,7 +219,6 @@ sal_uInt16 SvpSalGraphics::SetFont( FontSelectPattern* pIFSD, int nFallbackLevel return SAL_SETFONT_USEDRAWTEXTARRAY; } - void SvpSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLevel ) { if( nFallbackLevel >= MAX_FALLBACK ) @@ -235,7 +231,6 @@ void SvpSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLe } } - const ImplFontCharMap* SvpSalGraphics::GetImplFontCharMap() const { if( !m_pServerFont[0] ) @@ -253,7 +248,6 @@ bool SvpSalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabil return m_pServerFont[0]->GetFontCapabilities(rFontCapabilities); } - void SvpSalGraphics::GetDevFontList( PhysicalFontCollection* pFontCollection ) { GlyphCache& rGC = SvpGlyphCache::GetInstance(); @@ -293,14 +287,12 @@ void SvpSalGraphics::ClearDevFontCache() rGC.ClearFontCache(); } - bool SvpSalGraphics::AddTempDevFont( PhysicalFontCollection*, const OUString&, const OUString& ) { return false; } - bool SvpSalGraphics::CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, @@ -329,7 +321,6 @@ bool SvpSalGraphics::CreateFontSubset( return bSuccess; } - const Ucs2SIntMap* SvpSalGraphics::GetFontEncodingVector( const PhysicalFontFace* pFont, const Ucs2OStrMap** pNonEncoded ) { // in this context the pFont->GetFontId() is a valid PSP @@ -341,7 +332,6 @@ const Ucs2SIntMap* SvpSalGraphics::GetFontEncodingVector( const PhysicalFontFace return GenPspGraphics::DoGetFontEncodingVector( aFont, pNonEncoded ); } - const void* SvpSalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont, const sal_Ucs* pUnicodes, @@ -359,7 +349,6 @@ const void* SvpSalGraphics::GetEmbedFontData( return GenPspGraphics::DoGetEmbedFontData( aFont, pUnicodes, pWidths, rInfo, pDataLen ); } - void SvpSalGraphics::FreeEmbedFontData( const void* pData, long nLen ) { GenPspGraphics::DoFreeEmbedFontData( pData, nLen ); @@ -379,7 +368,6 @@ void SvpSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont, GenPspGraphics::DoGetGlyphWidths( aFont, bVertical, rWidths, rUnicodeEnc ); } - bool SvpSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) { const int nLevel = aGlyphId >> GF_FONTSHIFT; @@ -396,7 +384,6 @@ bool SvpSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) return true; } - bool SvpSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, B2DPolyPolygon& rPolyPoly ) { const int nLevel = aGlyphId >> GF_FONTSHIFT; @@ -414,7 +401,6 @@ bool SvpSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, B2DPolyPolygon& rPol return false; } - SalLayout* SvpSalGraphics::GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) { GenericSalLayout* pLayout = NULL; @@ -425,7 +411,6 @@ SalLayout* SvpSalGraphics::GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) return pLayout; } - void SvpSalGraphics::DrawServerFontLayout( const ServerFontLayout& rSalLayout ) { // iterate over all glyphs in the layout diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx index f457bcd5c7f4..5544252d70dc 100644 --- a/vcl/inc/PhysicalFontFace.hxx +++ b/vcl/inc/PhysicalFontFace.hxx @@ -27,7 +27,6 @@ struct FontMatchStatus; class FontSelectPattern; class PhysicalFontFamily; - struct FontMatchStatus { public: @@ -81,7 +80,5 @@ friend class PhysicalFontFamily; PhysicalFontFace* mpNext; }; - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/android/svsys.h b/vcl/inc/android/svsys.h index 25fac687d6ac..6939e5066f93 100644 --- a/vcl/inc/android/svsys.h +++ b/vcl/inc/android/svsys.h @@ -10,7 +10,6 @@ #ifndef INCLUDED_VCL_INC_ANDROID_SVSYS_H #define INCLUDED_VCL_INC_ANDROID_SVSYS_H - // ? #endif // INCLUDED_VCL_INC_ANDROID_SVSYS_H diff --git a/vcl/inc/controldata.hxx b/vcl/inc/controldata.hxx index 716265059f99..20720911d038 100644 --- a/vcl/inc/controldata.hxx +++ b/vcl/inc/controldata.hxx @@ -22,12 +22,9 @@ #include <vcl/controllayout.hxx> - namespace vcl { - - //= ImplControlData struct ImplControlData @@ -47,10 +44,8 @@ namespace vcl } }; - } // namespace vcl - #endif // INCLUDED_VCL_INC_CONTROLDATA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/dndevdis.hxx b/vcl/inc/dndevdis.hxx index b325ba57906c..a62abbd90360 100644 --- a/vcl/inc/dndevdis.hxx +++ b/vcl/inc/dndevdis.hxx @@ -90,7 +90,6 @@ public: virtual void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - /* * XEventListener */ @@ -98,10 +97,6 @@ public: virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& eo ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - - - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/dndlcon.hxx b/vcl/inc/dndlcon.hxx index f385682d069c..c365c3c511d7 100644 --- a/vcl/inc/dndlcon.hxx +++ b/vcl/inc/dndlcon.hxx @@ -87,7 +87,6 @@ public: virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL rejectDrag( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - /* * XDropTargetDropContext */ @@ -108,11 +107,6 @@ public: virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - - - - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx index ab2ceab50fc2..acac65cf524d 100644 --- a/vcl/inc/fontmanager.hxx +++ b/vcl/inc/fontmanager.hxx @@ -487,7 +487,6 @@ public: std::vector< sal_Int32 >& rWidths, std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc ); - // font administration functions /* system dependendent font matching diff --git a/vcl/inc/generic/gendisp.hxx b/vcl/inc/generic/gendisp.hxx index 2c5b5ec11a0d..4f341da9f5f3 100644 --- a/vcl/inc/generic/gendisp.hxx +++ b/vcl/inc/generic/gendisp.hxx @@ -74,7 +74,6 @@ public: { return m_pCapture; } }; - #endif // INCLUDED_VCL_INC_GENERIC_GENDISP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h index 076952e2340a..9cc47663949a 100644 --- a/vcl/inc/generic/genpspgraphics.h +++ b/vcl/inc/generic/genpspgraphics.h @@ -20,7 +20,6 @@ #ifndef INCLUDED_VCL_INC_GENERIC_GENPSPGRAPHICS_H #define INCLUDED_VCL_INC_GENERIC_GENPSPGRAPHICS_H - #include <vcl/vclenum.hxx> #include "fontmanager.hxx" diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index 98d6bc371013..7cd7bbae788e 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -63,8 +63,6 @@ namespace vcl struct FontCapabilities; } - - class VCL_DLLPUBLIC GlyphCache { public: @@ -112,8 +110,6 @@ private: class FreetypeManager* mpFtManager; }; - - class GlyphMetric { public: @@ -138,8 +134,6 @@ private: Size maSize; }; - - // the glyph specific data needed by a GlyphCachePeer is usually trivial, // not attaching it to the corresponding GlyphData would be overkill; // this is currently only used by the headless (aka svp) plugin, where meInfo is @@ -152,8 +146,6 @@ struct ExtGlyphData ExtGlyphData() : meInfo(0), mpData(NULL) {} }; - - class GlyphData { public: @@ -181,8 +173,6 @@ private: mutable long mnLruValue; }; - - class FtFontInfo; class VCL_DLLPUBLIC ServerFont @@ -285,8 +275,6 @@ private: ServerFontLayoutEngine* mpLayoutEngine; }; - - // a class for cache entries for physical font instances that are based on serverfonts class VCL_DLLPUBLIC ImplServerFontEntry : public ImplFontEntry { @@ -302,8 +290,6 @@ public: void HandleFontOptions(); }; - - class VCL_DLLPUBLIC ServerFontLayout : public GenericSalLayout { private: @@ -325,8 +311,6 @@ public: ServerFont& GetServerFont() const { return mrServerFont; } }; - - class ServerFontLayoutEngine { public: @@ -334,8 +318,6 @@ public: virtual bool layout(ServerFontLayout&, ImplLayoutArgs&) = 0; }; - - class GlyphCachePeer { protected: @@ -351,8 +333,6 @@ protected: sal_Int32 mnBytesUsed; }; - - class VCL_DLLPUBLIC RawBitmap { public: diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx index dee151c6541d..1fb877740bd6 100644 --- a/vcl/inc/generic/printergfx.hxx +++ b/vcl/inc/generic/printergfx.hxx @@ -272,7 +272,6 @@ public: void PSGSave (); void PSGRestore (); - /* PS helpers */ enum pspath_t { moveto = 0, lineto = 1 }; void PSBinLineTo (const Point& rCurrent, Point& rOld, @@ -412,7 +411,6 @@ public: } /* namespace psp */ - #endif // INCLUDED_VCL_INC_GENERIC_PRINTERGFX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/generic/printerjob.hxx b/vcl/inc/generic/printerjob.hxx index c9ea6b7b5d92..3466025318b1 100644 --- a/vcl/inc/generic/printerjob.hxx +++ b/vcl/inc/generic/printerjob.hxx @@ -31,7 +31,6 @@ namespace psp { // forward declarations class PrinterGfx; - class PrinterJob { private: // private data diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx index 8f075891fe4c..839568b13091 100644 --- a/vcl/inc/headless/svpdummies.hxx +++ b/vcl/inc/headless/svpdummies.hxx @@ -75,7 +75,6 @@ public: int nDefButton ) SAL_OVERRIDE; }; - #endif // INCLUDED_VCL_INC_HEADLESS_SVPDUMMIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx index e8c1431e2542..49fa496fa0eb 100644 --- a/vcl/inc/helpwin.hxx +++ b/vcl/inc/helpwin.hxx @@ -23,10 +23,8 @@ #include <vcl/floatwin.hxx> #include <vcl/timer.hxx> - // - HelpTextWindow - - class HelpTextWindow : public FloatingWindow { private: diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index 6163da02b023..9f928c9b7937 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -153,7 +153,6 @@ public: void SetSelectionAnchor( sal_Int32 nPos ) { mnSelectionAnchor = nPos; } sal_Int32 GetSelectionAnchor() const { return mnSelectionAnchor; } - void SetSelectionChangedHdl( const Link& rLnk ) { maSelectionChangedHdl = rLnk; } void SetCallSelectionChangedHdl( bool bCall ) { mbCallSelectionChangedHdl = bCall; } @@ -260,7 +259,6 @@ protected: void ImplShowFocusRect(); void ImplHideFocusRect(); - virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -467,7 +465,6 @@ public: void SetReadOnly( bool b ) { maLBWindow.SetReadOnly( b ); } bool IsReadOnly() const { return maLBWindow.IsReadOnly(); } - Size CalcSize( sal_Int32 nMaxLines ) const { return maLBWindow.CalcSize( nMaxLines ); } long GetEntryHeight() const { return maLBWindow.GetEntryHeight(); } long GetMaxEntryWidth() const { return maLBWindow.GetMaxEntryWidth(); } @@ -626,7 +623,6 @@ public: const Link& GetMBDownHdl() const { return maMBDownHdl; } }; - void ImplInitFieldSettings( Window* pWin, bool bFont, bool bForeground, bool bBackground ); void ImplInitDropDownButton( PushButton* pButton ); diff --git a/vcl/inc/image.h b/vcl/inc/image.h index d8b1ab639cbe..d9de98caa13f 100644 --- a/vcl/inc/image.h +++ b/vcl/inc/image.h @@ -24,10 +24,8 @@ #include <boost/unordered_map.hpp> - // - ImplImageBmp - - class ImplImageBmp { public: @@ -56,16 +54,12 @@ private: // prevent assignment and copy construction void operator=( const ImplImageBmp& ); }; - // - ImageTypes - - enum ImageType { IMAGETYPE_BITMAP, IMAGETYPE_IMAGE }; - // - ImplImageList - - struct ImageAryData { OUString maName; @@ -84,8 +78,6 @@ struct ImageAryData ImageAryData& operator=( const ImageAryData& rData ); }; - - struct ImplImageList { typedef std::vector<ImageAryData *> ImageAryDataVec; @@ -107,10 +99,8 @@ struct ImplImageList void RemoveImage( sal_uInt16 nPos ); }; - // - ImplImageRefData - - struct ImplImageRefData { ImplImageList* mpImplData; @@ -122,10 +112,8 @@ struct ImplImageRefData bool IsEqual( const ImplImageRefData& rData ); }; - // - ImpImageData - - struct ImplImageData { ImplImageBmp* mpImageBitmap; @@ -137,10 +125,8 @@ struct ImplImageData bool IsEqual( const ImplImageData& rData ); }; - // - ImplImage - - struct ImplImage { sal_uIntPtr mnRefCount; diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index 6f272941d81f..df6ea1b0c03d 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -29,10 +29,8 @@ #include <vcl/fntstyle.hxx> #include <outfont.hxx> - // - Impl_Font - - typedef sal_uInt32 FontRefCount; class Impl_Font @@ -86,10 +84,8 @@ private: friend SvStream& WriteImpl_Font( SvStream& rOStm, const Impl_Font& ); }; - // - ImplFontMetric - - class ImplFontMetric { friend class OutputDevice; @@ -127,10 +123,8 @@ public: bool operator==( const ImplFontMetric& ) const; }; - // - ImplFontOptions - - class ImplFontOptions { public: @@ -163,10 +157,8 @@ public: { return NULL; } }; - // - ImplFontCharMap - - class CmapResult; class VCL_PLUGIN_PUBLIC ImplFontCharMap diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx index e6cee9307343..20e305dc5690 100644 --- a/vcl/inc/impgraph.hxx +++ b/vcl/inc/impgraph.hxx @@ -27,20 +27,16 @@ #include <vcl/graph.h> #include <vcl/svgdata.hxx> - // - ImpSwapInfo - - struct ImpSwapInfo { MapMode maPrefMapMode; Size maPrefSize; }; - // - ImpGraphic - - class OutputDevice; class GfxLink; struct ImpSwapFile; @@ -102,7 +98,6 @@ private: Animation ImplGetAnimation() const; const GDIMetaFile& ImplGetGDIMetaFile() const; - Size ImplGetPrefSize() const; void ImplSetPrefSize( const Size& rPrefSize ); diff --git a/vcl/inc/impoct.hxx b/vcl/inc/impoct.hxx index 93f2df99c3ce..4183fc7fb5bc 100644 --- a/vcl/inc/impoct.hxx +++ b/vcl/inc/impoct.hxx @@ -22,10 +22,8 @@ #include "octree.hxx" - // - ImpErrorQuad - - class ImpErrorQuad { long nRed; @@ -59,8 +57,6 @@ public: inline BitmapColor ImplGetColor(); }; - - inline void ImpErrorQuad::operator=( const BitmapColor& rColor ) { nRed = (long) rColor.GetRed() << 5L; @@ -68,8 +64,6 @@ inline void ImpErrorQuad::operator=( const BitmapColor& rColor ) nBlue = (long) rColor.GetBlue() << 5L; } - - inline ImpErrorQuad& ImpErrorQuad::operator-=( const BitmapColor& rColor ) { nRed -= ( (long) rColor.GetRed() << 5L ); @@ -79,8 +73,6 @@ inline ImpErrorQuad& ImpErrorQuad::operator-=( const BitmapColor& rColor ) return *this; } - - inline void ImpErrorQuad::ImplAddColorError1( const ImpErrorQuad& rErrQuad ) { nRed += ( rErrQuad.nRed >> 4L ); @@ -88,8 +80,6 @@ inline void ImpErrorQuad::ImplAddColorError1( const ImpErrorQuad& rErrQuad ) nBlue += ( rErrQuad.nBlue >> 4L ); } - - inline void ImpErrorQuad::ImplAddColorError3( const ImpErrorQuad& rErrQuad ) { nRed += ( rErrQuad.nRed * 3L >> 4L ); @@ -97,8 +87,6 @@ inline void ImpErrorQuad::ImplAddColorError3( const ImpErrorQuad& rErrQuad ) nBlue += ( rErrQuad.nBlue * 3L >> 4L ); } - - inline void ImpErrorQuad::ImplAddColorError5( const ImpErrorQuad& rErrQuad ) { nRed += ( rErrQuad.nRed * 5L >> 4L ); @@ -106,8 +94,6 @@ inline void ImpErrorQuad::ImplAddColorError5( const ImpErrorQuad& rErrQuad ) nBlue += ( rErrQuad.nBlue * 5L >> 4L ); } - - inline void ImpErrorQuad::ImplAddColorError7( const ImpErrorQuad& rErrQuad ) { nRed += ( rErrQuad.nRed * 7L >> 4L ); @@ -115,8 +101,6 @@ inline void ImpErrorQuad::ImplAddColorError7( const ImpErrorQuad& rErrQuad ) nBlue += ( rErrQuad.nBlue *7L >> 4L ); } - - inline BitmapColor ImpErrorQuad::ImplGetColor() { return BitmapColor( (sal_uInt8) ( ( nRed < 0L ? 0L : nRed > 8160L ? 8160L : nRed ) >> 5L ), @@ -124,10 +108,8 @@ inline BitmapColor ImpErrorQuad::ImplGetColor() (sal_uInt8) ( ( nBlue < 0L ? 0L : nBlue > 8160L ? 8160L : nBlue ) >> 5L ) ); } - // - NodeCache - - class ImpNodeCache { OctreeNode* pActNode; @@ -141,8 +123,6 @@ public: inline void ImplReleaseNode( OctreeNode* pNode ); }; - - inline OctreeNode* ImpNodeCache::ImplGetFreeNode() { OctreeNode* pNode; @@ -160,8 +140,6 @@ inline OctreeNode* ImpNodeCache::ImplGetFreeNode() return pNode; } - - inline void ImpNodeCache::ImplReleaseNode( OctreeNode* pNode ) { pNode->pNextInCache = pActNode; diff --git a/vcl/inc/ios/svsys.h b/vcl/inc/ios/svsys.h index b476b74259b8..dcd14e79f2b3 100644 --- a/vcl/inc/ios/svsys.h +++ b/vcl/inc/ios/svsys.h @@ -10,7 +10,6 @@ #ifndef INCLUDED_VCL_INC_IOS_SVSYS_H #define INCLUDED_VCL_INC_IOS_SVSYS_H - // ? #endif // INCLUDED_VCL_INC_IOS_SVSYS_H diff --git a/vcl/inc/list.h b/vcl/inc/list.h index b19591022700..93a47109b60f 100644 --- a/vcl/inc/list.h +++ b/vcl/inc/list.h @@ -84,7 +84,6 @@ extern "C" } #endif - #endif // INCLUDED_VCL_INC_LIST_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/octree.hxx b/vcl/inc/octree.hxx index 186e4406fac1..ad2968121e49 100644 --- a/vcl/inc/octree.hxx +++ b/vcl/inc/octree.hxx @@ -104,7 +104,6 @@ private: sal_uInt8* pMap; const sal_uLong nBits; - SAL_DLLPRIVATE void ImplCreateBuffers( const sal_uLong nMax ); public: diff --git a/vcl/inc/osx/a11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx index 2b5e96f8fa2d..d4b4886f9ccc 100644 --- a/vcl/inc/osx/a11yfocustracker.hxx +++ b/vcl/inc/osx/a11yfocustracker.hxx @@ -34,10 +34,8 @@ class Window; class ToolBox; class DocumentFocusListener; - // - AquaA11yFocusTracker - - class AquaA11yFocusTracker : public rtl::Static< AquaA11yFocusTracker, AquaA11yFocusTracker> { diff --git a/vcl/inc/osx/a11ylistener.hxx b/vcl/inc/osx/a11ylistener.hxx index 503e986038d2..1861299f2b0f 100644 --- a/vcl/inc/osx/a11ylistener.hxx +++ b/vcl/inc/osx/a11ylistener.hxx @@ -28,10 +28,8 @@ #include <set> #include <com/sun/star/awt/Rectangle.hpp> - // - AquaA11yEventListener - - class AquaA11yEventListener : public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleEventListener > { diff --git a/vcl/inc/osx/keyboardfocuslistener.hxx b/vcl/inc/osx/keyboardfocuslistener.hxx index bf9e4b4b35ba..d31ac3123003 100644 --- a/vcl/inc/osx/keyboardfocuslistener.hxx +++ b/vcl/inc/osx/keyboardfocuslistener.hxx @@ -24,10 +24,8 @@ #include <rtl/ref.hxx> - // - KeyboardFocusListener - - class KeyboardFocusListener : public rtl::IReference { public: diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h index 7feac6e404e6..24fb17f2a3db 100644 --- a/vcl/inc/osx/salframe.h +++ b/vcl/inc/osx/salframe.h @@ -45,10 +45,8 @@ class AquaBlinker; typedef struct SalFrame::SalPointerState SalPointerState; - // - AquaSalFrame - - class AquaSalFrame : public SalFrame { public: diff --git a/vcl/inc/osx/salobj.h b/vcl/inc/osx/salobj.h index 26eac4db7b81..8e18a7d6f9f7 100644 --- a/vcl/inc/osx/salobj.h +++ b/vcl/inc/osx/salobj.h @@ -26,11 +26,8 @@ class AquaSalFrame; class AquaSalObject; - - // - SalObjectData - - struct SalObjectData { }; @@ -53,10 +50,8 @@ public: long mnWidth; long mnHeight; - void setClippedPosSize(); - AquaSalObject( AquaSalFrame* pFrame ); virtual ~AquaSalObject(); diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h index 3aa17becf245..7d35a99ac659 100644 --- a/vcl/inc/osx/salprn.h +++ b/vcl/inc/osx/salprn.h @@ -26,11 +26,8 @@ #include <boost/shared_array.hpp> - - // - AquaSalInfoPrinter - - class AquaSalGraphics; class AquaSalInfoPrinter : public SalInfoPrinter @@ -116,10 +113,8 @@ class AquaSalInfoPrinter : public SalInfoPrinter AquaSalInfoPrinter& operator=(const AquaSalInfoPrinter&); }; - // - AquaSalPrinter - - class AquaSalPrinter : public SalPrinter { AquaSalInfoPrinter* mpInfoPrinter; // pointer to the compatible InfoPrinter @@ -158,8 +153,6 @@ inline int PtTo10Mu( double nPoints ) { return (int)(((nPoints)*fPtTo100thMM)+0. inline double TenMuToPt( double nUnits ) { return floor(((nUnits)/fPtTo100thMM)+0.5); } - - #endif // INCLUDED_VCL_INC_OSX_SALPRN_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/osx/salsys.h b/vcl/inc/osx/salsys.h index 637362426ef8..91f7d45ba255 100644 --- a/vcl/inc/osx/salsys.h +++ b/vcl/inc/osx/salsys.h @@ -24,10 +24,8 @@ #include <list> - // - SalSystemData - - class VCL_DLLPUBLIC AquaSalSystem : public SalSystem { public: @@ -45,7 +43,6 @@ public: int nDefaultButton, bool bUseResources) SAL_OVERRIDE; }; - #endif // INCLUDED_VCL_INC_OSX_SALSYS_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/osx/saltimer.h b/vcl/inc/osx/saltimer.h index 4e5a91a3b711..b751a81c7778 100644 --- a/vcl/inc/osx/saltimer.h +++ b/vcl/inc/osx/saltimer.h @@ -38,7 +38,6 @@ class AquaSalTimer : public SalTimer static void handleStartTimerEvent( NSEvent* pEvent ); - static NSTimer* pRunningTimer; static bool bDispatchTimer; }; diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h index a8f4037a0dd5..dcde57c09ee9 100644 --- a/vcl/inc/outdev.h +++ b/vcl/inc/outdev.h @@ -173,7 +173,6 @@ struct ImplOutDevData void ImplFontSubstitute( OUString& rFontName ); - #endif // INCLUDED_VCL_INC_OUTDEV_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index 798f2611dcdc..2fa0862f2034 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -46,7 +46,6 @@ class Size; namespace com { namespace sun { namespace star { namespace lang { struct Locale; }}}} - // - ImplFontAttributes - // device independent font properties @@ -87,7 +86,6 @@ private: bool mbSymbolFlag; }; - // - ImplDevFontAttributes - // device dependent font properties @@ -160,10 +158,8 @@ public: // TODO: change to private void copyAttributes(const FontSelectPatternAttributes &rAttributes); }; - // - ImplFontMetricData - - class ImplFontMetricData : public ImplFontAttributes { public: @@ -218,7 +214,6 @@ public: // TODO: hide members behind accessor methods long mnDStrikeoutOffset2; // Offset of double strike-out to baseline }; - // - ImplFontEntry - // TODO: rename ImplFontEntry to LogicalFontInstance @@ -255,7 +250,6 @@ private: UnicodeFallbackList* mpUnicodeFallbackList; }; - class ImplTextLineInfo { private: diff --git a/vcl/inc/print.h b/vcl/inc/print.h index 219f0afb127e..2aa3c6b4a370 100644 --- a/vcl/inc/print.h +++ b/vcl/inc/print.h @@ -56,7 +56,6 @@ public: void ImplDeletePrnQueueList(); void ImplUpdateJobSetupPaper( JobSetup& rJobSetup ); - #endif // INCLUDED_VCL_INC_PRINT_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index a026b1d8a71f..f0883d03e6dd 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -292,7 +292,6 @@ namespace vcl }; } - #endif // INCLUDED_VCL_INC_PRINTDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h index c96257d5d43b..cd944319f818 100644 --- a/vcl/inc/quartz/salbmp.h +++ b/vcl/inc/quartz/salbmp.h @@ -36,10 +36,8 @@ #include "salvd.hxx" #include "salbmp.hxx" - // - SalBitmap - - struct BitmapBuffer; class BitmapPalette; diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 28999b470c72..7451321ed29d 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -122,7 +122,6 @@ private: CFMutableDictionaryRef GetStyleDict( void ) const { return mpStyleDict; } }; - // - SystemFontList - // TODO: move into cross-platform headers @@ -148,7 +147,6 @@ private: #ifdef MACOSX - // - AquaSalGraphics - class AquaSalGraphics : public SalGraphics diff --git a/vcl/inc/regband.hxx b/vcl/inc/regband.hxx index 0ef560e92e89..af63756cb4ae 100644 --- a/vcl/inc/regband.hxx +++ b/vcl/inc/regband.hxx @@ -111,7 +111,6 @@ public: bool IsInside( long nX ); - bool IsEmpty() const { return ((!mpFirstSep) && (!mpFirstBandPoint)); } bool operator==( const ImplRegionBand& rRegionBand ) const; diff --git a/vcl/inc/regionband.hxx b/vcl/inc/regionband.hxx index 199e17486e60..5676329cf9f6 100644 --- a/vcl/inc/regionband.hxx +++ b/vcl/inc/regionband.hxx @@ -27,8 +27,6 @@ const char* ImplDbgTestRegionBand(const void*); #endif - - class RegionBand { private: diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 8da2d40f3d2a..8ef263845caa 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -31,7 +31,6 @@ #include <map> - class PhysicalFontCollection; class SalBitmap; class FontSelectPattern; @@ -53,10 +52,8 @@ namespace basegfx { class B2DPolyPolygon; } - // - SalGraphics-Codes - - #define SAL_SETFONT_USEDRAWTEXTARRAY ((sal_uInt16)0x0004) #define SAL_SETFONT_BADFONT ((sal_uInt16)0x1000) diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index d3b70fcadf82..2dfca1f97eaa 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -77,7 +77,6 @@ public: bool PosIsInAnyRun( int nCharPos ) const; }; - class ImplLayoutArgs { public: @@ -310,7 +309,6 @@ public: maGlyphId(aGlyphId), maLinearPos(rLinearPos) {} - enum{ FALLBACK_MASK=0xFF, IS_IN_CLUSTER=0x100, IS_RTL_GLYPH=0x200, IS_DIACRITIC=0x400 }; bool IsClusterStart() const { return ((mnFlags & IS_IN_CLUSTER) == 0); } diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx index f0cafe3ea4de..5711534cfd99 100644 --- a/vcl/inc/salmenu.hxx +++ b/vcl/inc/salmenu.hxx @@ -40,7 +40,6 @@ struct SalItemParams Image aImage; // Image }; - struct SalMenuButtonItem { sal_uInt16 mnId; @@ -91,7 +90,6 @@ public: virtual Rectangle GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame ); }; - #endif // INCLUDED_VCL_INC_SALMENU_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx index 065eb0de7ffc..afe10e647b77 100644 --- a/vcl/inc/salobj.hxx +++ b/vcl/inc/salobj.hxx @@ -27,10 +27,8 @@ struct SystemEnvData; - // - SalObject-Types - - #define SAL_OBJECT_CLIP_INCLUDERECTS ((sal_uInt16)0x0001) #define SAL_OBJECT_CLIP_EXCLUDERECTS ((sal_uInt16)0x0002) #define SAL_OBJECT_CLIP_ABSOLUTE ((sal_uInt16)0x0004) diff --git a/vcl/inc/salptype.hxx b/vcl/inc/salptype.hxx index 589adfe3e97d..cbd04b028806 100644 --- a/vcl/inc/salptype.hxx +++ b/vcl/inc/salptype.hxx @@ -22,10 +22,8 @@ #include <tools/solar.h> - // - SalJobSetupFlags - - #define SAL_JOBSET_ORIENTATION ((sal_uLong)0x00000001) #define SAL_JOBSET_PAPERBIN ((sal_uLong)0x00000002) #define SAL_JOBSET_PAPERSIZE ((sal_uLong)0x00000004) @@ -35,17 +33,13 @@ SAL_JOBSET_PAPERSIZE |\ SAL_JOBSET_DUPLEXMODE) - // - SalPrinterError - - #define SAL_PRINTER_ERROR_GENERALERROR 1 #define SAL_PRINTER_ERROR_ABORT 2 - // - SalPrinterProcs - - class SalPrinter; typedef long (*SALPRNABORTPROC)( void* pInst, SalPrinter* pPrinter ); diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index b1044429ecb2..36eab51da2fd 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -31,10 +31,8 @@ class Window; class FontSelectPattern; - // - SalEvent - - #define SALEVENT_MOUSEMOVE ((sal_uInt16)1) #define SALEVENT_MOUSELEAVE ((sal_uInt16)2) #define SALEVENT_MOUSEBUTTONDOWN ((sal_uInt16)3) @@ -234,33 +232,25 @@ struct SalQueryCharPositionEvent long mnCursorBoundHeight; // The cursor bounds corresponding to the character specified by mnCharPos - Height }; - // - SalFrame-Types - - typedef bool (*SALFRAMEPROC)( Window* pInst, SalFrame* pFrame, sal_uInt16 nEvent, const void* pEvent ); - // - SalObject-Events - - #define SALOBJ_EVENT_GETFOCUS ((sal_uInt16)1) #define SALOBJ_EVENT_LOSEFOCUS ((sal_uInt16)2) #define SALOBJ_EVENT_TOTOP ((sal_uInt16)3) #define SALOBJ_EVENT_COUNT ((sal_uInt16)4) - // - SalObject-Types - - typedef long (*SALOBJECTPROC)( void* pInst, SalObject* pObject, sal_uInt16 nEvent, const void* pEvent ); - // - SalFrameState - - struct SalFrameState { sal_uLong mnMask; @@ -275,10 +265,8 @@ struct SalFrameState sal_uLong mnState; }; - // - SalInputContext - - // Have to match DEFINEs in inputctx.hxx, as these are not converted #define SAL_INPUTCONTEXT_TEXT ((sal_uLong)0x00000001) #define SAL_INPUTCONTEXT_EXTTEXTINPUT ((sal_uLong)0x00000002) diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx index 5c0120afee1e..6dae9de87400 100644 --- a/vcl/inc/sft.hxx +++ b/vcl/inc/sft.hxx @@ -48,7 +48,6 @@ * */ - #ifndef INCLUDED_VCL_INC_SFT_HXX #define INCLUDED_VCL_INC_SFT_HXX @@ -159,17 +158,12 @@ namespace vcl }; #endif - - - /** Structure used by GetTTSimpleGlyphMetrics() and GetTTSimpleCharMetrics() functions */ typedef struct { sal_uInt16 adv; /**< advance width or height */ sal_Int16 sb; /**< left or top sidebearing */ } TTSimpleGlyphMetrics; - - /** Structure used by the TrueType Creator and GetRawGlyphData() */ typedef struct { @@ -195,8 +189,6 @@ namespace vcl sal_uInt8 *sptr; /**< Pointer to string data (not zero-terminated!) */ } NameRecord; - - /** Return value of GetTTGlobalFontInfo() */ typedef struct { @@ -245,7 +237,6 @@ namespace vcl int y; /**< positive: up, negative: down */ } KernData; - /** ControlPoint structure used by GetTTGlyphPoints() */ typedef struct { sal_uInt32 flags; /**< 00000000 00000000 e0000000 bbbbbbbb */ @@ -262,7 +253,6 @@ namespace vcl * @defgroup sft Sun Font Tools Exported Functions */ - /** * Get the number of fonts contained in a TrueType collection * @param fname - file name @@ -271,7 +261,6 @@ namespace vcl */ int CountTTCFonts(const char* fname); - /** * TrueTypeFont constructor. * The font file has to be provided as a memory buffer and length @@ -375,7 +364,6 @@ namespace vcl */ void DisposeNameRecords(NameRecord* nr, int n); - #ifndef NO_TYPE3 /** * Generates a new PostScript Type 3 font and dumps it to <b>outf</b> file. @@ -457,7 +445,6 @@ namespace vcl int nGlyphs); #endif - /** * Queries glyph metrics. Allocates an array of TTSimpleGlyphMetrics structs and returns it. * diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 2fbaa840e192..7f64bd51757b 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -154,7 +154,6 @@ struct ImplSVAppData DECL_STATIC_LINK( ImplSVAppData, ImplQuitMsg, void* ); }; - struct ImplSVGDIData { OutputDevice* mpFirstWinGraphics; // First OutputDevice with a Frame Graphics @@ -180,7 +179,6 @@ struct ImplSVGDIData bool mbNoXORClipping; // true: do not use XOR to achieve clipping effects }; - struct ImplSVWinData { Window* mpFirstFrame; // First FrameWindow @@ -204,7 +202,6 @@ struct ImplSVWinData bool mbNoSaveBackground; // true: save background is unnecessary or even less performant }; - typedef std::vector< std::pair< OUString, FieldUnit > > FieldUnitStringList; struct ImplSVCtrlData @@ -232,7 +229,6 @@ struct ImplSVCtrlData FieldUnitStringList* mpCleanUnitStrings; // same list but with some "fluff" like spaces removed }; - struct ImplSVHelpData { bool mbContextHelp : 1; // is ContextHelp enabled diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h index cf89d02d9759..43c0c914e3b8 100644 --- a/vcl/inc/toolbox.h +++ b/vcl/inc/toolbox.h @@ -117,10 +117,8 @@ struct ToolBoxLayoutData : public ControlLayoutData std::vector< sal_uInt16 > m_aLineItemPositions; }; - } /* namespace vcl */ - struct ImplToolBoxPrivateData { vcl::ToolBoxLayoutData* m_pLayoutData; @@ -169,7 +167,6 @@ struct ImplToolBoxPrivateData mbDropDownByKeyboard:1; // tells whether a dropdown was started by key input }; - #endif // INCLUDED_VCL_INC_TOOLBOX_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 4466ca6dc155..becc2b3031aa 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -139,7 +139,6 @@ class GtkSalFrame : public SalFrame } }; - GtkSalFrame* m_pFrame; std::list< PreviousKeyPress > m_aPrevKeyPresses; int m_nPrevKeyPresses; // avoid using size() @@ -267,7 +266,6 @@ class GtkSalFrame : public SalFrame bool bSendRelease ); - GdkNativeWindow findTopLevelSystemWindow( GdkNativeWindow aWindow ); static int m_nFloats; @@ -418,7 +416,6 @@ public: // returns system data (most prominent: window handle) virtual const SystemEnvData* GetSystemData() const SAL_OVERRIDE; - // get current modifier and button mask virtual SalPointerState GetPointerState() SAL_OVERRIDE; diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index 006e29874d28..f6cec547fa7d 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -128,7 +128,6 @@ public: inline GtkSalFrame* GetGtkFrame() const { return static_cast<GtkSalFrame*>(m_pFrame); } void SetWindow( GtkWidget* window ) { m_pWindow = window; } - // will be set when UI theme was changed static bool bThemeChanged; static bool bNeedPixmapPaint; diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index 259611112651..ceda30361361 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -49,8 +49,6 @@ public: void ThreadsLeave(); }; - - class GtkSalTimer; #if GTK_CHECK_VERSION(3,0,0) class GtkInstance : public SvpSalInstance diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx index 56dfe8bfb1cb..1e9cddc7cd9a 100644 --- a/vcl/inc/unx/gtk/gtkprn.hxx +++ b/vcl/inc/unx/gtk/gtkprn.hxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - #ifndef INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX #define INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX @@ -17,7 +16,6 @@ struct GtkSalPrinter_Impl; - class VCL_DLLPUBLIC GtkSalPrinter : public PspSalPrinter { public: @@ -40,14 +38,12 @@ private: boost::scoped_ptr<GtkSalPrinter_Impl> m_pImpl; }; - class VCL_DLLPUBLIC GtkSalInfoPrinter : public PspSalInfoPrinter { public: sal_uLong GetCapabilities(const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType) SAL_OVERRIDE; }; - #endif // INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx index 9e7182d9cdd4..1cf47fae20f6 100644 --- a/vcl/inc/unx/i18n_ic.hxx +++ b/vcl/inc/unx/i18n_ic.hxx @@ -86,5 +86,4 @@ private: #endif // INCLUDED_VCL_INC_UNX_I18N_IC_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/i18n_im.hxx b/vcl/inc/unx/i18n_im.hxx index 9f418848d7bc..d1741eedebb8 100644 --- a/vcl/inc/unx/i18n_im.hxx +++ b/vcl/inc/unx/i18n_im.hxx @@ -51,5 +51,4 @@ public: #endif // INCLUDED_VCL_INC_UNX_I18N_IM_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/i18n_keysym.hxx b/vcl/inc/unx/i18n_keysym.hxx index 86138672e5cc..ae9c4ae30a2e 100644 --- a/vcl/inc/unx/i18n_keysym.hxx +++ b/vcl/inc/unx/i18n_keysym.hxx @@ -60,5 +60,4 @@ sal_Unicode KeysymToUnicode (KeySym nKeySym); #endif // INCLUDED_VCL_INC_UNX_I18N_KEYSYM_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h index f472d51e834f..f6cadaab8145 100644 --- a/vcl/inc/unx/salbmp.h +++ b/vcl/inc/unx/salbmp.h @@ -34,10 +34,8 @@ class SalGraphics; class ImplSalDDB; class ImplSalBitmapCache; - // - SalBitmap - - class VCLPLUG_GEN_PUBLIC X11SalBitmap : public SalBitmap { private: @@ -149,10 +147,8 @@ public: virtual bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE; }; - // - ImplSalDDB - - class ImplSalDDB { private: @@ -219,10 +215,8 @@ public: ) const; }; - // - ImplSalBitmapCache - - struct ImplBmpObj; class ImplSalBitmapCache diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 564f78f7286f..9207bee0c5ab 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -62,7 +62,6 @@ namespace vcl_sal { class WMAdaptor; } #define PROPERTY_DEFAULT 0x00000FCB - // server vendor typedef enum { @@ -405,7 +404,6 @@ public: void SetupInput( SalI18N_InputMethod *pInputMethod ); }; - // get foreign key names namespace vcl_sal { OUString getKeysymReplacementName( @@ -413,7 +411,6 @@ namespace vcl_sal { KeySym nSymbol ); } - #endif // INCLUDED_VCL_INC_UNX_SALDISP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index 8b0d0fa67028..b4f57e9c0146 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -99,7 +99,6 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame int m_nWorkArea; bool m_bSetFocusOnMap; - int nScreenSaversTimeout_; Rectangle maPaintRegion; diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 527aa87406b0..7c799f41020a 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -354,7 +354,6 @@ public: static void releaseGlyphPeer(); }; - inline const SalDisplay *X11SalGraphics::GetDisplay() const { return GetColormap().GetDisplay(); } @@ -367,7 +366,6 @@ inline Display *X11SalGraphics::GetXDisplay() const inline Pixel X11SalGraphics::GetPixel( SalColor nSalColor ) const { return GetColormap().GetPixel( nSalColor ); } - #ifdef DBG_UTIL #define stderr0( s ) fprintf( stderr, s ) #else diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h index 01fbc998cda5..7cc73958f9eb 100644 --- a/vcl/inc/unx/salobj.h +++ b/vcl/inc/unx/salobj.h @@ -54,7 +54,6 @@ private: sal_uInt16 nClipRegionType; }; - class VCLPLUG_GEN_PUBLIC X11SalObject : public SalObject { public: diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h index 1ec20174160d..dd84c3542fa3 100644 --- a/vcl/inc/unx/salvd.h +++ b/vcl/inc/unx/salvd.h @@ -34,7 +34,6 @@ class X11SalVirtualDevice : public SalVirtualDevice SalDisplay *pDisplay_; X11SalGraphics *pGraphics_; - Pixmap hDrawable_; SalX11Screen m_nXScreen; @@ -84,7 +83,6 @@ public: virtual void GetSize( long& rWidth, long& rHeight ) SAL_OVERRIDE; }; - #endif // INCLUDED_VCL_INC_UNX_SALVD_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/wall2.hxx b/vcl/inc/wall2.hxx index 14c5e1fa753b..724a65166286 100644 --- a/vcl/inc/wall2.hxx +++ b/vcl/inc/wall2.hxx @@ -48,7 +48,6 @@ public: void ImplReleaseCachedBitmap(); }; - #endif // INCLUDED_VCL_INC_WALL2_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h index c045e90a56f0..0962facb7e0c 100644 --- a/vcl/inc/win/salbmp.h +++ b/vcl/inc/win/salbmp.h @@ -25,10 +25,8 @@ #include <salbmp.hxx> #include <boost/shared_ptr.hpp> - // - SalBitmap - - struct BitmapBuffer; class BitmapColor; class BitmapPalette; diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index 8d297cd1b98a..6ab16db296c2 100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -285,7 +285,6 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 ); // POSTFOCUS-Message; wParam == bFocus; lParam == 0 #define SALOBJ_MSG_POSTFOCUS (WM_USER+161) - // A/W-Wrapper BOOL ImplPostMessage( HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam ); BOOL ImplSendMessage( HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam ); diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h index 526b87ab0b57..e2305b70fe8f 100644 --- a/vcl/inc/win/salframe.h +++ b/vcl/inc/win/salframe.h @@ -25,10 +25,8 @@ class WinSalGraphics; - // - WinSalFrame - - class WinSalFrame : public SalFrame { public: diff --git a/vcl/inc/win/salmenu.h b/vcl/inc/win/salmenu.h index 119bf1dbfc60..bd82312f06ee 100644 --- a/vcl/inc/win/salmenu.h +++ b/vcl/inc/win/salmenu.h @@ -54,7 +54,6 @@ public: WinSalMenuItem(); virtual ~WinSalMenuItem(); - MENUITEMINFOW mInfo; void* mpMenu; // pointer to corresponding VCL menu OUString mText; // the item text diff --git a/vcl/inc/win/salobj.h b/vcl/inc/win/salobj.h index bbb59ff35868..71f6c6e776d7 100644 --- a/vcl/inc/win/salobj.h +++ b/vcl/inc/win/salobj.h @@ -22,10 +22,8 @@ #include <salobj.hxx> - // - SalObjectData - - class WinSalObject : public SalObject { public: @@ -39,7 +37,6 @@ public: bool mbFirstClipRect; // Flag for first cliprect to insert WinSalObject* mpNextObject; // pointer to next object - WinSalObject(); virtual ~WinSalObject(); diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h index 7c15d019de38..1dcbb1342cef 100644 --- a/vcl/inc/win/salprn.h +++ b/vcl/inc/win/salprn.h @@ -22,10 +22,8 @@ #include <salprn.hxx> - // - SalDriverData - - // WNT3 #define SAL_DRIVERDATA_SYSSIGN ((sal_uIntPtr)0x574E5433) @@ -40,10 +38,8 @@ struct SalDriverData #pragma pack() - // - WinSalInfoPrinter - - class WinSalGraphics; class WinSalInfoPrinter : public SalInfoPrinter @@ -75,10 +71,8 @@ public: virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ); }; - // - WinSalPrinter - - class WinSalPrinter : public SalPrinter { public: diff --git a/vcl/inc/win/salvd.h b/vcl/inc/win/salvd.h index 3c7d3e998e52..546a1f0dda53 100644 --- a/vcl/inc/win/salvd.h +++ b/vcl/inc/win/salvd.h @@ -24,10 +24,8 @@ class WinSalGraphics; - // - SalVirDevData - - class WinSalVirtualDevice : public SalVirtualDevice { private: diff --git a/vcl/inc/win/wincomp.hxx b/vcl/inc/win/wincomp.hxx index 07e01fad3eef..e92095c95bae 100644 --- a/vcl/inc/win/wincomp.hxx +++ b/vcl/inc/win/wincomp.hxx @@ -22,10 +22,8 @@ #include <string.h> - // - Strict - - // Anpassungen fuer TypeChecking inline HPEN SelectPen( HDC hDC, HPEN hPen ) @@ -173,10 +171,8 @@ inline HINSTANCE GetWindowInstance( HWND hWnd ) return (HINSTANCE)GetWindowLongPtr( hWnd, GWLP_HINSTANCE ); } - // - ZMouse Erweiterungen - - #define MSH_MOUSEWHEEL "MSWHEEL_ROLLMSG" #define MOUSEZ_CLASSNAME "MouseZ" // wheel window class @@ -203,20 +199,15 @@ inline HINSTANCE GetWindowInstance( HWND hWnd ) #define WHEEL_PAGESCROLL (UINT_MAX) #endif - - // - SystemAgent Erweiterungen - - #define ENABLE_AGENT 1 #define DISABLE_AGENT 2 #define GET_AGENT_STATUS 3 typedef int (APIENTRY* SysAgt_Enable_PROC)( int ); - // - 5.0-Erweiterungen - - #ifndef COLOR_GRADIENTACTIVECAPTION #define COLOR_GRADIENTACTIVECAPTION 27 #endif @@ -238,11 +229,9 @@ typedef int (APIENTRY* SysAgt_Enable_PROC)( int ); #define CS_DROPSHADOW 0x00020000 #endif - // MT 12/03: From winuser.h, only needed in salframe.cxx // Better change salframe.cxx to include winuser.h - #define WS_EX_LAYERED 0x00080000 #ifndef WM_UNICHAR diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 3bd78ae822f6..089583692f87 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -47,7 +47,6 @@ class VCLXWindow; class SalFrame; class SalObject; - namespace com { namespace sun { namespace star { diff --git a/vcl/ios/dummies.cxx b/vcl/ios/dummies.cxx index a98fdbc26a61..bf73412b9414 100644 --- a/vcl/ios/dummies.cxx +++ b/vcl/ios/dummies.cxx @@ -41,7 +41,6 @@ void SvpSalInstance::DestroyPrinter( SalPrinter* pPrinter ) delete pPrinter; } - void SvpSalInstance::PostPrintersChanged() { } diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx index 5c243dcf1e61..857e0768daa5 100644 --- a/vcl/ios/iosinst.cxx +++ b/vcl/ios/iosinst.cxx @@ -227,7 +227,6 @@ SalFrame *IosSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nStyle ) return new IosSalFrame( this, pParent, nStyle, NULL ); } - // All the interesting stuff is slaved from the IosSalInstance void InitSalData() {} void DeInitSalData() {} diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx index f79c018b5c85..65a67c596fc5 100644 --- a/vcl/null/printerinfomanager.cxx +++ b/vcl/null/printerinfomanager.cxx @@ -24,7 +24,6 @@ using namespace psp; using namespace osl; - PrinterInfoManager& PrinterInfoManager::get() { SalData* pSalData = GetSalData(); diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx index b971b05e4e7a..1f8fd70ced68 100644 --- a/vcl/osx/DataFlavorMapping.cxx +++ b/vcl/osx/DataFlavorMapping.cxx @@ -45,7 +45,6 @@ using namespace com::sun::star::lang; using namespace cppu; using namespace std; - namespace // private { /* Determine whether or not a DataFlavor is valid. @@ -99,7 +98,6 @@ namespace // private const char* FLAVOR_DUMMY_INTERNAL = "application/x-openoffice-internal"; - struct FlavorMap { const NSString* SystemFlavor; @@ -130,10 +128,8 @@ namespace // private { PBTYPE_DUMMY_INTERNAL, FLAVOR_DUMMY_INTERNAL, "internal data",false } }; - #define SIZE_FLAVOR_MAP (sizeof(flavorMap)/sizeof(FlavorMap)) - inline bool isByteSequenceType(const Type& theType) { return (theType == getCppuType((Sequence<sal_Int8>*)0)); @@ -146,9 +142,6 @@ namespace // private } // namespace private - - - /* A base class for other data provider. */ class DataProviderBaseImpl : public DataProvider @@ -176,7 +169,6 @@ DataProviderBaseImpl::DataProviderBaseImpl(id data) : [mSystemData retain]; } - DataProviderBaseImpl::~DataProviderBaseImpl() { if (mSystemData) @@ -185,8 +177,6 @@ DataProviderBaseImpl::~DataProviderBaseImpl() } } - - class UniDataProvider : public DataProviderBaseImpl { public: @@ -238,8 +228,6 @@ Any UniDataProvider::getOOoData() return oOOData; } - - class ByteSequenceDataProvider : public DataProviderBaseImpl { public: @@ -262,7 +250,6 @@ ByteSequenceDataProvider::ByteSequenceDataProvider(NSData* data) : { } - NSData* ByteSequenceDataProvider::getSystemData() { Sequence<sal_Int8> rawData; @@ -291,9 +278,6 @@ Any ByteSequenceDataProvider::getOOoData() return oOOData; } - - - class HTMLFormatDataProvider : public DataProviderBaseImpl { public: @@ -357,8 +341,6 @@ Any HTMLFormatDataProvider::getOOoData() return oOOData; } - - class PNGDataProvider : public DataProviderBaseImpl { NSBitmapImageFileType meImageType; @@ -423,8 +405,6 @@ Any PNGDataProvider::getOOoData() return oOOData; } - - class FileListDataProvider : public DataProviderBaseImpl { public: @@ -487,8 +467,6 @@ Any FileListDataProvider::getOOoData() return oOOData; } - - DataFlavorMapper::DataFlavorMapper() { Reference<XComponentContext> xContext = comphelper::getProcessComponentContext(); @@ -727,7 +705,6 @@ com::sun::star::uno::Sequence<com::sun::star::datatransfer::DataFlavor> DataFlav return flavors; } - NSArray* DataFlavorMapper::getAllSupportedPboardTypes() const { NSMutableArray* array = [[NSMutableArray alloc] initWithCapacity: SIZE_FLAVOR_MAP]; diff --git a/vcl/osx/DataFlavorMapping.hxx b/vcl/osx/DataFlavorMapping.hxx index b22813795e19..f8b09df85f23 100644 --- a/vcl/osx/DataFlavorMapping.hxx +++ b/vcl/osx/DataFlavorMapping.hxx @@ -33,7 +33,6 @@ #include <memory> #include <boost/shared_ptr.hpp> - /* An interface to get the clipboard data in either system or OOo format. */ @@ -55,10 +54,6 @@ public: typedef std::auto_ptr<DataProvider> DataProviderPtr_t; - - - - class DataFlavorMapper { public: @@ -68,7 +63,6 @@ public: DataFlavorMapper(); ~DataFlavorMapper(); - /* Map a system data flavor to an OpenOffice data flavor. Return an empty string if there is not suiteable mapping from a system data flavor to a OpenOffice data @@ -76,7 +70,6 @@ public: */ com::sun::star::datatransfer::DataFlavor systemToOpenOfficeFlavor( const NSString* systemDataFlavor) const; - /* Map an OpenOffice data flavor to a system data flavor. If there is no suiteable mapping available NULL will be returned. @@ -95,18 +88,14 @@ public: DataProviderPtr_t getDataProvider( const NSString* systemFlavor, const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable > rTransferable) const; - - /* Get a data provider which is able to provide 'systemData' in the OOo expected format. */ DataProviderPtr_t getDataProvider( const NSString* systemFlavor, NSArray* systemData) const; - /* Get a data provider which is able to provide 'systemData' in the OOo expected format. */ DataProviderPtr_t getDataProvider( const NSString* systemFlavor, NSData* systemData) const; - /* Translate a sequence of DataFlavors into a NSArray of system types. Only those DataFlavors for which a suitable mapping to a system type exist will be contained in the returned types array. diff --git a/vcl/osx/DragActionConversion.cxx b/vcl/osx/DragActionConversion.cxx index d4bb9e5c3c86..e0c80a09313e 100644 --- a/vcl/osx/DragActionConversion.cxx +++ b/vcl/osx/DragActionConversion.cxx @@ -20,10 +20,8 @@ #include "DragActionConversion.hxx" #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> - using namespace com::sun::star::datatransfer::dnd; - /* Convert office drag actions as defined in <type>com::sun::star::datatransfer::dnd::DNDConstants</type> into system conform drag actions. diff --git a/vcl/osx/DragActionConversion.hxx b/vcl/osx/DragActionConversion.hxx index 8c9b057bff0f..8539a79fc3c6 100644 --- a/vcl/osx/DragActionConversion.hxx +++ b/vcl/osx/DragActionConversion.hxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sal/types.h> #include <premac.h> #import <Cocoa/Cocoa.h> #include <postmac.h> - /* Convert office drag actions as defined in <type>com::sun::star::datatransfer::dnd::DNDConstants</type> into system conform drag actions. diff --git a/vcl/osx/DragSource.cxx b/vcl/osx/DragSource.cxx index 10a0b80f0abd..6435041fe5c7 100644 --- a/vcl/osx/DragSource.cxx +++ b/vcl/osx/DragSource.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/awt/MouseButton.hpp> @@ -37,7 +36,6 @@ #include <cassert> #include <memory> - using namespace cppu; using namespace osl; using namespace com::sun::star; @@ -52,7 +50,6 @@ using namespace com::sun::star::lang; using namespace comphelper; using namespace std; - // For OOo internal D&D we provide the Transferable without NSDragPboard // interference as a shortcut uno::Reference<XTransferable> DragSource::g_XTransferable; @@ -60,7 +57,6 @@ NSView* DragSource::g_DragSourceView = nil; bool DragSource::g_DropSuccessSet = false; bool DragSource::g_DropSuccess = false; - OUString dragSource_getImplementationName() { return OUString("com.sun.star.comp.datatransfer.dnd.OleDragSource_V1"); diff --git a/vcl/osx/DragSource.hxx b/vcl/osx/DragSource.hxx index 27554975b1d0..491716d87f4c 100644 --- a/vcl/osx/DragSource.hxx +++ b/vcl/osx/DragSource.hxx @@ -36,7 +36,6 @@ #import <Cocoa/Cocoa.h> #include <postmac.h> - class DragSource; class AquaSalFrame; @@ -53,7 +52,6 @@ class AquaSalFrame; -(void)unregisterMouseEventListener:(id)theHandler; @end - @interface DragSourceHelper : NSObject { DragSource* mDragSource; @@ -71,7 +69,6 @@ class AquaSalFrame; @end - class DragSource : public ::cppu::BaseMutex, public ::cppu::WeakComponentImplHelper3< com::sun::star::datatransfer::dnd::XDragSource, com::sun::star::lang::XInitialization, diff --git a/vcl/osx/DragSourceContext.cxx b/vcl/osx/DragSourceContext.cxx index ff1e98069f2d..ac3b9221d98a 100644 --- a/vcl/osx/DragSourceContext.cxx +++ b/vcl/osx/DragSourceContext.cxx @@ -21,7 +21,6 @@ #include "DragSourceContext.hxx" - using namespace com::sun::star::datatransfer::dnd; using namespace com::sun::star::datatransfer::dnd::DNDConstants; using namespace com::sun::star::uno; @@ -57,5 +56,4 @@ void SAL_CALL DragSourceContext::transferablesFlavorsChanged( ) { } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx index c7bb86ba8f02..307181cbb904 100644 --- a/vcl/osx/DropTarget.cxx +++ b/vcl/osx/DropTarget.cxx @@ -46,7 +46,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star; using namespace comphelper; - OUString dropTarget_getImplementationName() { return OUString("com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1"); @@ -69,10 +68,8 @@ namespace /* private */ } } - @implementation DropTargetHelper - -(DropTargetHelper*)initWithDropTarget:(DropTarget*)pdt { self = [super init]; @@ -85,7 +82,6 @@ namespace /* private */ return self; } - -(NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender { return mDropTarget->draggingEntered(sender); diff --git a/vcl/osx/DropTarget.hxx b/vcl/osx/DropTarget.hxx index cb7a575c7953..d67b647b7111 100644 --- a/vcl/osx/DropTarget.hxx +++ b/vcl/osx/DropTarget.hxx @@ -56,7 +56,6 @@ class AquaSalFrame; -(void)unregisterDraggingDestinationHandler:(id)theHandler; @end - @interface DropTargetHelper : NSObject { DropTarget* mDropTarget; @@ -73,7 +72,6 @@ class AquaSalFrame; @end - class DropTarget: public cppu::BaseMutex, public cppu::WeakComponentImplHelper5< com::sun::star::lang::XInitialization, com::sun::star::datatransfer::dnd::XDropTarget, diff --git a/vcl/osx/HtmlFmtFlt.cxx b/vcl/osx/HtmlFmtFlt.cxx index 11ef00fdd6d6..aee4863c4836 100644 --- a/vcl/osx/HtmlFmtFlt.cxx +++ b/vcl/osx/HtmlFmtFlt.cxx @@ -29,7 +29,6 @@ using namespace com::sun::star::uno; - // converts the openoffice text/html clipboard format to the HTML Format // well known under MS Windows // the MS HTML Format has a header before the real html data @@ -53,7 +52,6 @@ using namespace com::sun::star::uno; // <!--StartFragment--> and <!--EndFragment--> (no space between !-- and the // text - namespace // private { std::string GetHtmlFormatHeader(size_t startHtml, size_t endHtml, size_t startFragment, size_t endFragment) @@ -69,7 +67,6 @@ std::string GetHtmlFormatHeader(size_t startHtml, size_t endHtml, size_t startFr } // namespace private - // the office always writes the start and end html tag in upper cases and // without spaces both tags don't allow parameters const std::string TAG_HTML = std::string("<html>"); diff --git a/vcl/osx/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx index d01b4aaf470c..1a4f5d9814ac 100644 --- a/vcl/osx/OSXTransferable.cxx +++ b/vcl/osx/OSXTransferable.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star::io; using namespace com::sun::star::lang; using namespace com::sun::star::container; - namespace // private { bool isValidFlavor( const DataFlavor& aFlavor ) @@ -44,7 +43,6 @@ namespace // private } // namespace private - OSXTransferable::OSXTransferable(const Reference<XMimeContentTypeFactory> rXMimeCntFactory, DataFlavorMapperPtr_t pDataFlavorMapper, NSPasteboard* pasteboard) : @@ -57,13 +55,11 @@ OSXTransferable::OSXTransferable(const Reference<XMimeContentTypeFactory> rXMime initClipboardItemList(); } - OSXTransferable::~OSXTransferable() { [mPasteboard release]; } - Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor ) throw( UnsupportedFlavorException, IOException, RuntimeException, std::exception ) { @@ -100,20 +96,17 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor ) return dp->getOOoData(); } - bool OSXTransferable::isUnicodeText(const DataFlavor& flavor) { return (flavor.DataType == getCppuType((OUString*)0)); } - Sequence< DataFlavor > SAL_CALL OSXTransferable::getTransferDataFlavors( ) throw( RuntimeException, std::exception ) { return mFlavorList; } - sal_Bool SAL_CALL OSXTransferable::isDataFlavorSupported(const DataFlavor& aFlavor) throw( RuntimeException, std::exception ) { @@ -124,7 +117,6 @@ sal_Bool SAL_CALL OSXTransferable::isDataFlavorSupported(const DataFlavor& aFlav return false; } - void OSXTransferable::initClipboardItemList() { NSArray* pboardFormats = [mPasteboard types]; @@ -138,7 +130,6 @@ void OSXTransferable::initClipboardItemList() mFlavorList = mDataFlavorMapper->typesArrayToFlavorSequence(pboardFormats); } - /* Compares two DataFlavors. Returns true if both DataFlavor have the same media type and the number of parameter and all parameter values do match otherwise false is returned. @@ -165,7 +156,6 @@ bool OSXTransferable::compareDataFlavors(const DataFlavor& lhs, const DataFlavor return true; } - bool OSXTransferable::cmpAllContentTypeParameter(const Reference<XMimeContentType> xLhs, const Reference<XMimeContentType> xRhs) const { diff --git a/vcl/osx/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx index aa794c8c7def..29a1d98b8641 100644 --- a/vcl/osx/OSXTransferable.hxx +++ b/vcl/osx/OSXTransferable.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef _TRANSFERABLE_HXX_ #define _TRANSFERABLE_HXX_ @@ -36,7 +35,6 @@ #include <boost/utility.hpp> #include <vector> - class OSXTransferable : public ::cppu::WeakImplHelper1<com::sun::star::datatransfer::XTransferable>, private ::boost::noncopyable { @@ -49,10 +47,8 @@ public: virtual ~OSXTransferable(); - // XTransferable - virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw( ::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/vcl/osx/a11yfocuslistener.cxx b/vcl/osx/a11yfocuslistener.cxx index 225473069d28..264a51eff719 100644 --- a/vcl/osx/a11yfocuslistener.cxx +++ b/vcl/osx/a11yfocuslistener.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <salhelper/refobj.hxx> #include "osx/a11yfocustracker.hxx" @@ -28,11 +27,8 @@ using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; - rtl::Reference< AquaA11yFocusListener > AquaA11yFocusListener::theListener; - - rtl::Reference< AquaA11yFocusListener > AquaA11yFocusListener::get() { if ( ! theListener.is() ) @@ -41,14 +37,10 @@ rtl::Reference< AquaA11yFocusListener > AquaA11yFocusListener::get() return theListener; } - - AquaA11yFocusListener::AquaA11yFocusListener() : m_focusedObject(nil) { } - - id AquaA11yFocusListener::getFocusedUIElement() { if ( nil == m_focusedObject ) { @@ -67,8 +59,6 @@ id AquaA11yFocusListener::getFocusedUIElement() return m_focusedObject; } - - void SAL_CALL AquaA11yFocusListener::focusedObjectChanged(const Reference< XAccessible >& xAccessible) { @@ -91,16 +81,12 @@ AquaA11yFocusListener::focusedObjectChanged(const Reference< XAccessible >& xAcc } } - - oslInterlockedCount SAL_CALL AquaA11yFocusListener::acquire() SAL_THROW(()) { return ReferenceObject::acquire(); } - - oslInterlockedCount SAL_CALL AquaA11yFocusListener::release() SAL_THROW(()) { diff --git a/vcl/osx/a11yfocustracker.cxx b/vcl/osx/a11yfocustracker.cxx index cbd634251fab..1ce09a61a89b 100644 --- a/vcl/osx/a11yfocustracker.cxx +++ b/vcl/osx/a11yfocustracker.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/svapp.hxx" #include "vcl/window.hxx" #include "vcl/toolbox.hxx" @@ -36,17 +35,12 @@ using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; - - static inline Window * getWindow(const ::VclSimpleEvent *pEvent) { return static_cast< const ::VclWindowEvent *> (pEvent)->GetWindow(); } - - - // callback function for Application::addEventListener long AquaA11yFocusTracker::WindowEventHandler(AquaA11yFocusTracker *pFocusTracker, ::VclSimpleEvent const *pEvent) @@ -94,8 +88,6 @@ long AquaA11yFocusTracker::WindowEventHandler(AquaA11yFocusTracker *pFocusTracke return 0; } - - AquaA11yFocusTracker::AquaA11yFocusTracker() : m_aWindowEventLink(this, (PSTUB) WindowEventHandler), m_xDocumentFocusListener(new DocumentFocusListener(*this)) @@ -104,8 +96,6 @@ AquaA11yFocusTracker::AquaA11yFocusTracker() : window_got_focus(Application::GetFocusWindow()); } - - void AquaA11yFocusTracker::setFocusedObject(const Reference< XAccessible >& xAccessible) { if( xAccessible != m_xFocusedObject ) @@ -117,8 +107,6 @@ void AquaA11yFocusTracker::setFocusedObject(const Reference< XAccessible >& xAcc } } - - void AquaA11yFocusTracker::notify_toolbox_item_focus(ToolBox *pToolBox) { Reference< XAccessible > xAccessible( pToolBox->GetAccessible() ); @@ -136,8 +124,6 @@ void AquaA11yFocusTracker::notify_toolbox_item_focus(ToolBox *pToolBox) } } - - void AquaA11yFocusTracker::toolbox_open_floater(Window *pWindow) { bool bToolboxFound = false; @@ -171,8 +157,6 @@ void AquaA11yFocusTracker::toolbox_open_floater(Window *pWindow) } } - - void AquaA11yFocusTracker::toolbox_highlight_on(Window *pWindow) { // Make sure either the toolbox or its parent toolbox has the focus @@ -186,8 +170,6 @@ void AquaA11yFocusTracker::toolbox_highlight_on(Window *pWindow) notify_toolbox_item_focus(static_cast <ToolBox *> (pWindow)); } - - void AquaA11yFocusTracker::toolbox_highlight_off(Window *pWindow) { ToolBox* pToolBoxParent = dynamic_cast< ToolBox * >( pWindow->GetParent() ); @@ -197,8 +179,6 @@ void AquaA11yFocusTracker::toolbox_highlight_off(Window *pWindow) notify_toolbox_item_focus( pToolBoxParent ); } - - void AquaA11yFocusTracker::tabpage_activated(Window *pWindow) { Reference< XAccessible > xAccessible( pWindow->GetAccessible() ); @@ -212,8 +192,6 @@ void AquaA11yFocusTracker::tabpage_activated(Window *pWindow) } } - - void AquaA11yFocusTracker::menu_highlighted(const VclMenuEvent *pEvent) { Menu * pMenu = pEvent->GetMenu(); @@ -227,8 +205,6 @@ void AquaA11yFocusTracker::menu_highlighted(const VclMenuEvent *pEvent) } } - - void AquaA11yFocusTracker::window_got_focus(Window *pWindow) { // The menu bar is handled through VCLEVENT_MENU_HIGHLIGHTED diff --git a/vcl/osx/a11ylistener.cxx b/vcl/osx/a11ylistener.cxx index cd1a450d61b4..bc966361633a 100644 --- a/vcl/osx/a11ylistener.cxx +++ b/vcl/osx/a11ylistener.cxx @@ -50,30 +50,22 @@ NSString * getTableNotification( const AccessibleEventObject& aEvent ) return notification; } - - AquaA11yEventListener::AquaA11yEventListener(id wrapperObject, sal_Int16 role) : m_wrapperObject(wrapperObject), m_role(role) { [ m_wrapperObject retain ]; } - - AquaA11yEventListener::~AquaA11yEventListener() { [ m_wrapperObject release ]; } - - void SAL_CALL AquaA11yEventListener::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { [ AquaA11yFactory removeFromWrapperRepositoryFor: [ (AquaA11yWrapper *) m_wrapperObject accessibleContext ] ]; } - - void SAL_CALL AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw( RuntimeException, std::exception ) { diff --git a/vcl/osx/clipboard.cxx b/vcl/osx/clipboard.cxx index f27f0d37d7a9..8a223f5f3e12 100644 --- a/vcl/osx/clipboard.cxx +++ b/vcl/osx/clipboard.cxx @@ -36,7 +36,6 @@ using namespace osl; using namespace std; using namespace comphelper; - @implementation EventListener; -(EventListener*)initWithAquaClipboard: (AquaClipboard*) pcb @@ -131,7 +130,6 @@ AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard mPasteboardChangeCount = [mPasteboard changeCount]; } - AquaClipboard::~AquaClipboard() { if (mIsSystemPasteboard) diff --git a/vcl/osx/clipboard.hxx b/vcl/osx/clipboard.hxx index bcacc6348edb..1fd71e623bfc 100644 --- a/vcl/osx/clipboard.hxx +++ b/vcl/osx/clipboard.hxx @@ -62,7 +62,6 @@ class AquaClipboard; -(void)disposing; @end - class AquaClipboard : public ::cppu::BaseMutex, public ::cppu::WeakComponentImplHelper3< com::sun::star::datatransfer::clipboard::XSystemClipboard, com::sun::star::datatransfer::clipboard::XFlushableClipboard, @@ -86,10 +85,8 @@ public: virtual ~AquaClipboard(); - // XClipboard - virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -100,33 +97,25 @@ public: virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XClipboardEx - virtual sal_Int8 SAL_CALL getRenderingCapabilities() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XClipboardNotifier - virtual void SAL_CALL addClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFlushableClipboard - virtual void SAL_CALL flushClipboard( ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/vcl/osx/documentfocuslistener.cxx b/vcl/osx/documentfocuslistener.cxx index 4ab3949eaf83..908700383704 100644 --- a/vcl/osx/documentfocuslistener.cxx +++ b/vcl/osx/documentfocuslistener.cxx @@ -29,16 +29,11 @@ using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; - - - DocumentFocusListener::DocumentFocusListener(AquaA11yFocusTracker& rTracker) : m_aFocusTracker(rTracker) { } - - void SAL_CALL DocumentFocusListener::disposing( const EventObject& aEvent ) throw (RuntimeException, std::exception) @@ -49,8 +44,6 @@ DocumentFocusListener::disposing( const EventObject& aEvent ) m_aRefList.erase(aEvent.Source); } - - void SAL_CALL DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent ) throw( RuntimeException, std::exception ) @@ -97,8 +90,6 @@ DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent ) } } - - Reference< XAccessible > DocumentFocusListener::getAccessible(const EventObject& aEvent ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -125,8 +116,6 @@ Reference< XAccessible > DocumentFocusListener::getAccessible(const EventObject& return Reference< XAccessible >(); } - - void DocumentFocusListener::attachRecursive(const Reference< XAccessible >& xAccessible) throw (IndexOutOfBoundsException, RuntimeException) { @@ -136,8 +125,6 @@ void DocumentFocusListener::attachRecursive(const Reference< XAccessible >& xAcc attachRecursive(xAccessible, xContext); } - - void DocumentFocusListener::attachRecursive( const Reference< XAccessible >& xAccessible, const Reference< XAccessibleContext >& xContext @@ -152,8 +139,6 @@ void DocumentFocusListener::attachRecursive( } } - - void DocumentFocusListener::attachRecursive( const Reference< XAccessible >& xAccessible, const Reference< XAccessibleContext >& xContext, @@ -185,8 +170,6 @@ void DocumentFocusListener::attachRecursive( } } - - void DocumentFocusListener::detachRecursive(const Reference< XAccessible >& xAccessible) throw (IndexOutOfBoundsException, RuntimeException) { @@ -196,8 +179,6 @@ void DocumentFocusListener::detachRecursive(const Reference< XAccessible >& xAcc detachRecursive(xAccessible, xContext); } - - void DocumentFocusListener::detachRecursive( const Reference< XAccessible >& xAccessible, const Reference< XAccessibleContext >& xContext @@ -209,8 +190,6 @@ void DocumentFocusListener::detachRecursive( detachRecursive(xAccessible, xContext, xStateSet); } - - void DocumentFocusListener::detachRecursive( const Reference< XAccessible >&, const Reference< XAccessibleContext >& xContext, diff --git a/vcl/osx/documentfocuslistener.hxx b/vcl/osx/documentfocuslistener.hxx index 82abb5ff67db..05b1fc2331ea 100644 --- a/vcl/osx/documentfocuslistener.hxx +++ b/vcl/osx/documentfocuslistener.hxx @@ -28,10 +28,8 @@ #include <set> - // - DocumentFocusListener - - class DocumentFocusListener : public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleEventListener > { diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index fa4fe5464261..23748fe7fe49 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string> #include "rtl/ustrbuf.hxx" @@ -54,12 +53,8 @@ using namespace std; - - AquaSalFrame* AquaSalFrame::s_pCaptureFrame = NULL; - - AquaSalFrame::AquaSalFrame( SalFrame* pParent, sal_uLong salFrameStyle ) : mpNSWindow(nil), mpNSView(nil), @@ -99,8 +94,6 @@ AquaSalFrame::AquaSalFrame( SalFrame* pParent, sal_uLong salFrameStyle ) : pSalData->maFrameCheck.insert( this ); } - - AquaSalFrame::~AquaSalFrame() { // if the frame is destroyed and has the current menubar @@ -135,8 +128,6 @@ AquaSalFrame::~AquaSalFrame() [mpNSWindow release]; } - - void AquaSalFrame::initWindowAndView() { // initialize mirroring parameters @@ -227,8 +218,6 @@ void AquaSalFrame::initWindowAndView() [mpNSWindow setContentView: mpNSView]; } - - void AquaSalFrame::CocoaToVCL( NSRect& io_rRect, bool bRelativeToScreen ) { if( bRelativeToScreen ) @@ -261,8 +250,6 @@ void AquaSalFrame::VCLToCocoa( NSPoint& io_rPoint, bool bRelativeToScreen ) io_rPoint.y = maGeometry.nHeight - io_rPoint.y; } - - void AquaSalFrame::screenParametersChanged() { UpdateFrameGeometry(); @@ -272,8 +259,6 @@ void AquaSalFrame::screenParametersChanged() CallCallback( SALEVENT_DISPLAYCHANGED, 0 ); } - - SalGraphics* AquaSalFrame::AcquireGraphics() { if ( mbGraphics ) @@ -289,8 +274,6 @@ SalGraphics* AquaSalFrame::AcquireGraphics() return mpGraphics; } - - void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics ) { (void)pGraphics; @@ -298,15 +281,12 @@ void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics ) mbGraphics = FALSE; } - - bool AquaSalFrame::PostEvent( void *pData ) { GetSalData()->mpFirstInstance->PostUserEvent( this, SALEVENT_USEREVENT, pData ); return TRUE; } - void AquaSalFrame::SetTitle(const OUString& rTitle) { if ( !mpNSWindow ) @@ -343,14 +323,10 @@ void AquaSalFrame::SetTitle(const OUString& rTitle) [pTitle release]; } - - void AquaSalFrame::SetIcon( sal_uInt16 ) { } - - void AquaSalFrame::SetRepresentedURL( const OUString& i_rDocURL ) { // #i113170# may not be the main thread if called from UNO API @@ -369,8 +345,6 @@ void AquaSalFrame::SetRepresentedURL( const OUString& i_rDocURL ) } } - - void AquaSalFrame::initShow() { mbInitShow = false; @@ -422,8 +396,6 @@ void AquaSalFrame::SendPaintEvent( const Rectangle* pRect ) CallCallback(SALEVENT_PAINT, &aPaintEvt); } - - void AquaSalFrame::Show(bool bVisible, bool bNoActivate) { if ( !mpNSWindow ) @@ -485,14 +457,10 @@ void AquaSalFrame::Show(bool bVisible, bool bNoActivate) } } - - void AquaSalFrame::Enable( bool ) { } - - void AquaSalFrame::SetMinClientSize( long nWidth, long nHeight ) { // #i113170# may not be the main thread if called from UNO API @@ -516,8 +484,6 @@ void AquaSalFrame::SetMinClientSize( long nWidth, long nHeight ) } } - - void AquaSalFrame::SetMaxClientSize( long nWidth, long nHeight ) { // #i113170# may not be the main thread if called from UNO API @@ -545,8 +511,6 @@ void AquaSalFrame::SetMaxClientSize( long nWidth, long nHeight ) } } - - void AquaSalFrame::GetClientSize( long& rWidth, long& rHeight ) { if( mbShown || mbInitShow ) @@ -561,8 +525,6 @@ void AquaSalFrame::GetClientSize( long& rWidth, long& rHeight ) } } - - void AquaSalFrame::SetWindowState( const SalFrameState* pState ) { // #i113170# may not be the main thread if called from UNO API @@ -591,7 +553,6 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState ) else if( [mpNSWindow isMiniaturized] ) [mpNSWindow deminiaturize: NSApp]; - /* ZOOMED is not really maximized (actually it toggles between a user set size and the program specified one), but comes closest since the default behavior is "maximized" if the user did not intervene @@ -637,8 +598,6 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState ) } } - - bool AquaSalFrame::GetWindowState( SalFrameState* pState ) { if ( !mpNSWindow ) @@ -671,8 +630,6 @@ bool AquaSalFrame::GetWindowState( SalFrameState* pState ) return TRUE; } - - void AquaSalFrame::SetScreenNumber(unsigned int nScreen) { if ( !mpNSWindow ) @@ -711,8 +668,6 @@ void AquaSalFrame::SetApplicationID( const OUString &/*rApplicationID*/ ) { } - - void AquaSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) { if ( !mpNSWindow ) @@ -808,8 +763,6 @@ void AquaSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) SendPaintEvent(); } - - #if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 class PreventSleepTimer : public AutoTimer { @@ -866,14 +819,10 @@ void AquaSalFrame::StartPresentation( bool bStart ) } } - - void AquaSalFrame::SetAlwaysOnTop( bool ) { } - - void AquaSalFrame::ToTop(sal_uInt16 nFlags) { if ( !mpNSWindow ) @@ -893,8 +842,6 @@ void AquaSalFrame::ToTop(sal_uInt16 nFlags) [mpNSWindow orderFront: NSApp]; } - - NSCursor* AquaSalFrame::getCurrentCursor() const { NSCursor* pCursor = nil; @@ -949,8 +896,6 @@ void AquaSalFrame::SetPointer( PointerStyle ePointerStyle ) [mpNSWindow invalidateCursorRectsForView: mpNSView]; } - - void AquaSalFrame::SetPointerPos( long nX, long nY ) { // FIXME: use Cocoa functions @@ -961,8 +906,6 @@ void AquaSalFrame::SetPointerPos( long nX, long nY ) CGDisplayMoveCursorToPoint( mainDisplayID, aPoint ); } - - void AquaSalFrame::Flush( void ) { if( !(mbGraphics && mpGraphics && mpNSView && mbShown) ) @@ -971,7 +914,6 @@ void AquaSalFrame::Flush( void ) // #i113170# may not be the main thread if called from UNO API SalData::ensureThreadAutoreleasePool(); - [mpNSView setNeedsDisplay: YES]; // outside of the application's event loop (e.g. IntroWindow) @@ -983,8 +925,6 @@ void AquaSalFrame::Flush( void ) } } - - void AquaSalFrame::Flush( const Rectangle& rRect ) { if( !(mbGraphics && mpGraphics && mpNSView && mbShown) ) @@ -1006,8 +946,6 @@ void AquaSalFrame::Flush( const Rectangle& rRect ) } } - - void AquaSalFrame::Sync() { if( mbGraphics && mpGraphics && mpNSView && mbShown ) @@ -1020,8 +958,6 @@ void AquaSalFrame::Sync() } } - - void AquaSalFrame::SetInputContext( SalInputContext* pContext ) { if (!pContext) @@ -1036,14 +972,10 @@ void AquaSalFrame::SetInputContext( SalInputContext* pContext ) return; } - - void AquaSalFrame::EndExtTextInput( sal_uInt16 ) { } - - OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode ) { static std::map< sal_uInt16, OUString > aKeyMap; @@ -1129,8 +1061,6 @@ OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode ) return aResult.makeStringAndClear(); } - - static void getAppleScrollBarVariant(StyleSettings &rSettings) { bool bIsScrollbarDoubleMax = true; // default is DoubleMax @@ -1328,22 +1258,16 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings ) [mpNSView unlockFocus]; } - - const SystemEnvData* AquaSalFrame::GetSystemData() const { return &maSysData; } - - void AquaSalFrame::Beep() { NSBeep(); } - - void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags) { if ( !mpNSWindow ) @@ -1534,7 +1458,6 @@ SalPointerState AquaSalFrame::GetPointerState() state.mnState |= KEY_MOD1; } - return state; } @@ -1663,8 +1586,6 @@ void AquaSalFrame::UpdateFrameGeometry() maGeometry.nHeight = static_cast<unsigned int>(aContentRect.size.height); } - - void AquaSalFrame::CaptureMouse( bool bCapture ) { /* Remark: diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 2c28ac9a915b..fce9e95b1178 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -70,7 +70,6 @@ static NSMenu* pDockMenu = nil; static bool bNoSVMain = true; static bool bLeftMain = false; - class AquaDelayedSettingsChanged : public Timer { bool mbInvalidate; @@ -108,7 +107,6 @@ void AquaSalInstance::delayedSettingsChanged( bool bInvalidate ) pTimer->Start(); } - // the AppEventList must be available before any SalData/SalInst/etc. objects are ready AquaSalInstance::AppEventList AquaSalInstance::aAppEventList; @@ -132,7 +130,6 @@ bool AquaSalInstance::isOnCommandLine( const OUString& rArg ) return false; } - // initialize the cocoa VCL_NSApplication object // returns an NSAutoreleasePool that must be released when the event loop begins static void initNSApp() @@ -210,8 +207,6 @@ bool ImplSVMainHook( int * pnInit ) return TRUE; // indicate that ImplSVMainHook is implemented } - - void SalAbort( const OUString& rErrorText, bool bDumpCore ) { if( rErrorText.isEmpty() ) @@ -225,24 +220,18 @@ void SalAbort( const OUString& rErrorText, bool bDumpCore ) _exit(1); } - - void InitSalData() { SalData *pSalData = new SalData; SetSalData( pSalData ); } - - const OUString& SalGetDesktopEnvironment() { static OUString aDesktopEnvironment( "MacOSX" ); return aDesktopEnvironment; } - - void DeInitSalData() { SalData *pSalData = GetSalData(); @@ -255,20 +244,14 @@ void DeInitSalData() SetSalData( NULL ); } - - extern "C" { #include <crt_externs.h> } - - void InitSalMain() { } - - SalYieldMutex::SalYieldMutex() { mnCount = 0; @@ -305,8 +288,6 @@ bool SalYieldMutex::tryToAcquire() return false; } - - // some convenience functions regarding the yield mutex, aka solar mutex bool ImplSalYieldMutexTryToAcquire() @@ -332,8 +313,6 @@ void ImplSalYieldMutexRelease() pInst->mpSalYieldMutex->release(); } - - SalInstance* CreateSalInstance() { // this is the case for not using SVMain @@ -362,15 +341,11 @@ SalInstance* CreateSalInstance() return pInst; } - - void DestroySalInstance( SalInstance* pInst ) { delete pInst; } - - AquaSalInstance::AquaSalInstance() { mpSalYieldMutex = new SalYieldMutex; @@ -383,8 +358,6 @@ AquaSalInstance::AquaSalInstance() maWaitingYieldCond = osl_createCondition(); } - - AquaSalInstance::~AquaSalInstance() { ::tools::SolarMutex::SetSolarMutex( 0 ); @@ -394,8 +367,6 @@ AquaSalInstance::~AquaSalInstance() osl_destroyCondition( maWaitingYieldCond ); } - - void AquaSalInstance::wakeupYield() { // wakeup :Yield @@ -416,8 +387,6 @@ void AquaSalInstance::wakeupYield() } } - - void AquaSalInstance::PostUserEvent( AquaSalFrame* pFrame, sal_uInt16 nType, void* pData ) { osl_acquireMutex( maUserEventListMutex ); @@ -428,15 +397,11 @@ void AquaSalInstance::PostUserEvent( AquaSalFrame* pFrame, sal_uInt16 nType, voi wakeupYield(); } - - comphelper::SolarMutex* AquaSalInstance::GetYieldMutex() { return mpSalYieldMutex; } - - sal_uLong AquaSalInstance::ReleaseYieldMutex() { SalYieldMutex* pYieldMutex = mpSalYieldMutex; @@ -457,8 +422,6 @@ sal_uLong AquaSalInstance::ReleaseYieldMutex() return 0; } - - void AquaSalInstance::AcquireYieldMutex( sal_uLong nCount ) { SalYieldMutex* pYieldMutex = mpSalYieldMutex; @@ -469,8 +432,6 @@ void AquaSalInstance::AcquireYieldMutex( sal_uLong nCount ) } } - - bool AquaSalInstance::CheckYieldMutex() { bool bRet = true; @@ -484,15 +445,11 @@ bool AquaSalInstance::CheckYieldMutex() return bRet; } - - bool AquaSalInstance::isNSAppThread() const { return osl::Thread::getCurrentIdentifier() == maMainThread; } - - void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent ) { switch( [pEvent subtype] ) @@ -590,8 +547,6 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent ) }; } - - class ReleasePoolHolder { NSAutoreleasePool* mpPool; @@ -746,8 +701,6 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents ) } } - - bool AquaSalInstance::AnyInput( sal_uInt16 nType ) { if( nType & VCL_INPUT_APPEVENT ) @@ -792,15 +745,11 @@ bool AquaSalInstance::AnyInput( sal_uInt16 nType ) return (pEvent != NULL); } - - SalFrame* AquaSalInstance::CreateChildFrame( SystemParentData*, sal_uLong /*nSalFrameStyle*/ ) { return NULL; } - - SalFrame* AquaSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nSalFrameStyle ) { SalData::ensureThreadAutoreleasePool(); @@ -809,15 +758,11 @@ SalFrame* AquaSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nSalFrameSt return pFrame; } - - void AquaSalInstance::DestroyFrame( SalFrame* pFrame ) { delete pFrame; } - - SalObject* AquaSalInstance::CreateObject( SalFrame* pParent, SystemWindowData* /* pWindowData */, bool /* bShow */ ) { // SystemWindowData is meaningless on Mac OS X @@ -829,29 +774,21 @@ SalObject* AquaSalInstance::CreateObject( SalFrame* pParent, SystemWindowData* / return pObject; } - - void AquaSalInstance::DestroyObject( SalObject* pObject ) { delete ( pObject ); } - - SalPrinter* AquaSalInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter ) { return new AquaSalPrinter( dynamic_cast<AquaSalInfoPrinter*>(pInfoPrinter) ); } - - void AquaSalInstance::DestroyPrinter( SalPrinter* pPrinter ) { delete pPrinter; } - - void AquaSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) { NSArray* pNames = [NSPrinter printerNames]; @@ -878,21 +815,15 @@ void AquaSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) } } - - void AquaSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* ) { } - - void AquaSalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) { delete pInfo; } - - OUString AquaSalInstance::GetDefaultPrinter() { // #i113170# may not be the main thread if called from UNO API @@ -917,8 +848,6 @@ OUString AquaSalInstance::GetDefaultPrinter() return maDefaultPrinter; } - - SalInfoPrinter* AquaSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, ImplJobSetup* pSetupData ) { @@ -936,8 +865,6 @@ SalInfoPrinter* AquaSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueI return pNewInfoPrinter; } - - void AquaSalInstance::DestroyInfoPrinter( SalInfoPrinter* pPrinter ) { // #i113170# may not be the main thread if called from UNO API @@ -946,8 +873,6 @@ void AquaSalInstance::DestroyInfoPrinter( SalInfoPrinter* pPrinter ) delete pPrinter; } - - void* AquaSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) { rReturnedBytes = 1; @@ -1017,37 +942,26 @@ void AquaSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OU } } - - - SalTimer* AquaSalInstance::CreateSalTimer() { return new AquaSalTimer(); } - - SalSystem* AquaSalInstance::CreateSalSystem() { return new AquaSalSystem(); } - - SalBitmap* AquaSalInstance::CreateSalBitmap() { return new QuartzSalBitmap(); } - - SalSession* AquaSalInstance::CreateSalSession() { return NULL; } - - class MacImeStatus : public SalI18NImeStatus { public: @@ -1060,8 +974,6 @@ public: virtual void toggle() SAL_OVERRIDE {} }; - - SalI18NImeStatus* AquaSalInstance::CreateI18NImeStatus() { return new MacImeStatus(); diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx index 30b9a37b5edc..303c1fe21073 100644 --- a/vcl/osx/salmenu.cxx +++ b/vcl/osx/salmenu.cxx @@ -89,7 +89,6 @@ const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = NULL; } @end - // FIXME: currently this is leaked static MainMenuSelector* pMainMenuSelector = nil; @@ -203,8 +202,6 @@ static void initAppMenu() } } - - SalMenu* AquaSalInstance::CreateMenu( bool bMenuBar, Menu* pVCLMenu ) { initAppMenu(); @@ -235,10 +232,6 @@ void AquaSalInstance::DestroyMenuItem( SalMenuItem* pSalMenuItem ) delete pSalMenuItem; } - - - - /* * AquaSalMenu */ @@ -904,8 +897,6 @@ Rectangle AquaSalMenu::GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame ); } - - /* * SalMenuItem */ @@ -954,6 +945,4 @@ AquaSalMenuItem::~AquaSalMenuItem() [mpMenuItem autorelease]; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx index 016979ae3d83..7f9df92c739d 100644 --- a/vcl/osx/salobj.cxx +++ b/vcl/osx/salobj.cxx @@ -17,15 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string.h> #include "osx/saldata.hxx" #include "osx/salobj.h" #include "osx/salframe.h" - - AquaSalObject::AquaSalObject( AquaSalFrame* pFrame ) : mpFrame( pFrame ), mnClipX( -1 ), @@ -56,8 +53,6 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame ) : } } - - AquaSalObject::~AquaSalObject() { if( maSysData.mpNSView ) @@ -93,30 +88,22 @@ AquaSalObject::~AquaSalObject() This is gives us an 80% solution only, though. */ - - void AquaSalObject::ResetClipRegion() { mbClip = false; setClippedPosSize(); } - - sal_uInt16 AquaSalObject::GetClipRegionType() { return SAL_OBJECT_CLIP_INCLUDERECTS; } - - void AquaSalObject::BeginSetClipRegion( sal_uLong ) { mbClip = false; } - - void AquaSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) { if( mbClip ) @@ -146,15 +133,11 @@ void AquaSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight } } - - void AquaSalObject::EndSetClipRegion() { setClippedPosSize(); } - - void AquaSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) { mnX = nX; @@ -164,8 +147,6 @@ void AquaSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) setClippedPosSize(); } - - void AquaSalObject::setClippedPosSize() { NSRect aViewRect = { NSZeroPoint, NSMakeSize( mnWidth, mnHeight) }; @@ -194,16 +175,12 @@ void AquaSalObject::setClippedPosSize() [mpClipView scrollToPoint: aClipPt]; } - - void AquaSalObject::Show( bool bVisible ) { if( mpClipView ) [mpClipView setHidden: (bVisible ? NO : YES)]; } - - const SystemEnvData* AquaSalObject::GetSystemData() const { return &maSysData; diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx index dfaaf7eb8bca..a973505bbf5b 100644 --- a/vcl/osx/salprn.cxx +++ b/vcl/osx/salprn.cxx @@ -45,9 +45,6 @@ using namespace vcl; using namespace com::sun::star; using namespace com::sun::star::beans; - - - AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) : mpGraphics( 0 ), mbGraphics( false ), @@ -91,8 +88,6 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) : } } - - AquaSalInfoPrinter::~AquaSalInfoPrinter() { delete mpGraphics; @@ -102,8 +97,6 @@ AquaSalInfoPrinter::~AquaSalInfoPrinter() CFRelease( mrContext ); } - - void AquaSalInfoPrinter::SetupPrinterGraphics( CGContextRef i_rContext ) const { if( mpGraphics ) @@ -147,8 +140,6 @@ void AquaSalInfoPrinter::SetupPrinterGraphics( CGContextRef i_rContext ) const } } - - SalGraphics* AquaSalInfoPrinter::AcquireGraphics() { SalGraphics* pGraphics = mbGraphics ? NULL : mpGraphics; @@ -156,29 +147,22 @@ SalGraphics* AquaSalInfoPrinter::AcquireGraphics() return pGraphics; } - - void AquaSalInfoPrinter::ReleaseGraphics( SalGraphics* ) { mbGraphics = false; } - - bool AquaSalInfoPrinter::Setup( SalFrame*, ImplJobSetup* ) { return false; } - - bool AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData ) { // FIXME: implement driver data if( io_pSetupData && io_pSetupData->mpDriverData ) return SetData( ~0, io_pSetupData ); - bool bSuccess = true; // set system type @@ -214,12 +198,9 @@ bool AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData ) else bSuccess = false; - return bSuccess; } - - void AquaSalInfoPrinter::setPaperSize( long i_nWidth, long i_nHeight, Orientation i_eSetOrientation ) { @@ -240,14 +221,11 @@ void AquaSalInfoPrinter::setPaperSize( long i_nWidth, long i_nHeight, Orientatio mePageOrientation = i_eSetOrientation; } - - bool AquaSalInfoPrinter::SetData( sal_uLong i_nFlags, ImplJobSetup* io_pSetupData ) { if( ! io_pSetupData || io_pSetupData->mnSystem != JOBSETUP_SYSTEM_MAC ) return false; - if( mpPrintInfo ) { if( (i_nFlags & SAL_JOBSET_ORIENTATION) != 0 ) @@ -280,22 +258,16 @@ bool AquaSalInfoPrinter::SetData( sal_uLong i_nFlags, ImplJobSetup* io_pSetupDat return mpPrintInfo != nil; } - - sal_uLong AquaSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* ) { return 0; } - - OUString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uLong ) { return OUString(); } - - sal_uLong AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup*, sal_uInt16 i_nType ) { switch( i_nType ) @@ -328,8 +300,6 @@ sal_uLong AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup*, sal_uInt16 i return 0; } - - void AquaSalInfoPrinter::GetPageInfo( const ImplJobSetup*, long& o_rOutWidth, long& o_rOutHeight, long& o_rPageOffX, long& o_rPageOffY, @@ -422,7 +392,6 @@ bool AquaSalInfoPrinter::StartJob( const OUString* i_pFileName, // how do I know when that might be ? i_rController.jobStarted(); - int nCopies = i_rController.getPrinter()->GetCopyCount(); int nJobs = 1; if( bSinglePrintJobs ) @@ -506,7 +475,6 @@ bool AquaSalInfoPrinter::StartJob( const OUString* i_pFileName, // is a mystery. [pPrintDict setObject: [NSNumber numberWithInt: mnCurPageRangeCount] forKey: NSPrintLastPage]; - // create print operation NSPrintOperation* pPrintOperation = [NSPrintOperation printOperationWithView: pPrintView printInfo: mpPrintInfo]; @@ -594,28 +562,20 @@ bool AquaSalInfoPrinter::EndPage() return true; } - - sal_uLong AquaSalInfoPrinter::GetErrorCode() const { return 0; } - - AquaSalPrinter::AquaSalPrinter( AquaSalInfoPrinter* i_pInfoPrinter ) : mpInfoPrinter( i_pInfoPrinter ) { } - - AquaSalPrinter::~AquaSalPrinter() { } - - bool AquaSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJobName, const OUString& i_rAppName, @@ -625,8 +585,6 @@ bool AquaSalPrinter::StartJob( const OUString* i_pFileName, return mpInfoPrinter->StartJob( i_pFileName, i_rJobName, i_rAppName, i_pSetupData, i_rController ); } - - bool AquaSalPrinter::StartJob( const OUString* /*i_pFileName*/, const OUString& /*i_rJobName*/, const OUString& /*i_rAppName*/, @@ -639,36 +597,26 @@ bool AquaSalPrinter::StartJob( const OUString* /*i_pFileName*/, return false; } - - bool AquaSalPrinter::EndJob() { return mpInfoPrinter->EndJob(); } - - bool AquaSalPrinter::AbortJob() { return mpInfoPrinter->AbortJob(); } - - SalGraphics* AquaSalPrinter::StartPage( ImplJobSetup* i_pSetupData, bool i_bNewJobData ) { return mpInfoPrinter->StartPage( i_pSetupData, i_bNewJobData ); } - - bool AquaSalPrinter::EndPage() { return mpInfoPrinter->EndPage(); } - - sal_uLong AquaSalPrinter::GetErrorCode() { return mpInfoPrinter->GetErrorCode(); @@ -744,5 +692,4 @@ int AquaSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* ) return 900; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/osx/salsys.cxx b/vcl/osx/salsys.cxx index 5fd29a8b9acb..f10ba61b62e0 100644 --- a/vcl/osx/salsys.cxx +++ b/vcl/osx/salsys.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "rtl/ustrbuf.hxx" #include "vcl/button.hxx" @@ -29,9 +28,6 @@ #include "svids.hrc" - - - AquaSalSystem::~AquaSalSystem() { } @@ -154,7 +150,6 @@ int AquaSalSystem::ShowNativeMessageBox( const OUString& rTitle, } } - int nResult = NSRunAlertPanel( pTitle, @"%@", pDefText, pAltText, pOthText, pMessage ); if( pTitle ) diff --git a/vcl/osx/saltimer.cxx b/vcl/osx/saltimer.cxx index 15a960117c93..17c4d80ac3c0 100644 --- a/vcl/osx/saltimer.cxx +++ b/vcl/osx/saltimer.cxx @@ -17,19 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "osx/saltimer.h" #include "osx/salnstimer.h" #include "osx/saldata.hxx" #include "osx/salframe.h" #include "osx/salinst.h" - - NSTimer* AquaSalTimer::pRunningTimer = nil; bool AquaSalTimer::bDispatchTimer = false; - void ImplSalStartTimer( sal_uLong nMS ) { SalData* pSalData = GetSalData(); @@ -121,5 +117,4 @@ void AquaSalTimer::Stop() ImplSalStopTimer(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/osx/service_entry.cxx b/vcl/osx/service_entry.cxx index d4fa284c2ddb..63b616b3fb9a 100644 --- a/vcl/osx/service_entry.cxx +++ b/vcl/osx/service_entry.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "osl/diagnose.h" #include "vcl/svapp.hxx" @@ -37,7 +36,6 @@ using namespace ::cppu; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::datatransfer::clipboard; - uno::Reference< XInterface > AquaSalInstance::CreateClipboard( const Sequence< Any >& i_rArguments ) { if ( Application::IsHeadlessModeEnabled() ) diff --git a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx index 77bb2462f84f..723143826574 100644 --- a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx +++ b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx @@ -94,7 +94,6 @@ IconThemeInfoTest::DefaultZipIsValid() CPPUNIT_ASSERT_EQUAL_MESSAGE("default.zip is a valid theme name", true, valid); } - void IconThemeInfoTest::ThemeIdIsDetectedFromFileNameWithUnderscore() { diff --git a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx index 9da845ba4255..40ff352778fb 100644 --- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx +++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx @@ -68,7 +68,6 @@ class IconThemeSelectorTest : public CppUnit::TestFixture // End of test suite definition - CPPUNIT_TEST_SUITE_END(); }; @@ -189,7 +188,6 @@ IconThemeSelectorTest::DifferentPreferredThemesAreInequal() CPPUNIT_ASSERT_EQUAL_MESSAGE("Different preferred themes are detected as inequal", false, equal); } - // Put the test suite in the registry CPPUNIT_TEST_SUITE_REGISTRATION(IconThemeSelectorTest); diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index 10228b591f57..734fbcc8f06c 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // bootstrap stuff #include <test/bootstrapfixture.hxx> @@ -46,7 +45,6 @@ using namespace ::com::sun::star; using namespace ::vcl::unotools; - namespace com { namespace sun { namespace star { namespace rendering { @@ -61,7 +59,6 @@ bool operator==( const ARGBColor& rLHS, const RGBColor& rRHS ) } } } } - namespace { @@ -683,15 +680,12 @@ public: } }; - - void CanvasBitmapTest::runTest() { static const sal_Int8 lcl_depths[]={1,4,8,16,24}; // Testing VclCanvasBitmap wrapper - for( unsigned int i=0; i<SAL_N_ELEMENTS(lcl_depths); ++i ) { const sal_Int8 nDepth( lcl_depths[i] ); diff --git a/vcl/qa/cppunit/dndtest.cxx b/vcl/qa/cppunit/dndtest.cxx index e0f9d92cfa3f..8e85894c78ec 100644 --- a/vcl/qa/cppunit/dndtest.cxx +++ b/vcl/qa/cppunit/dndtest.cxx @@ -46,8 +46,6 @@ using namespace ::com::sun::star::datatransfer; using namespace ::com::sun::star::datatransfer::clipboard; using namespace ::com::sun::star::datatransfer::dnd; - - class MyWin : public WorkWindow { public: @@ -62,8 +60,6 @@ public: void Resize(); }; - - class MyDragAndDropListener: public ::cppu::WeakImplHelper3 < XDropTargetListener, XDragGestureListener, XDragSourceListener > { Window * m_pWindow; @@ -86,8 +82,6 @@ public: virtual void SAL_CALL disposing( const EventObject& eo ) throw(RuntimeException); }; - - class MyInfoBox : public InfoBox { @@ -96,8 +90,6 @@ public: MyInfoBox( Window* pParent ); }; - - class MyListBox : public ListBox { @@ -106,8 +98,6 @@ public: MyListBox( Window* pParent ); }; - - class StringTransferable : public ::cppu::WeakImplHelper1< XTransferable > { const OUString m_aData; @@ -129,9 +119,6 @@ public: virtual bool SAL_CALL isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException); }; - - - class VclDnDTest : public test::BootstrapFixture { public: @@ -145,8 +132,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; - - void VclDnDTest::testDnD() { MyWin aMainWin( NULL, WB_APP | WB_STDWORK ); @@ -167,8 +152,6 @@ void VclDnDTest::testDnD() aListBox.Show(); } - - MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : WorkWindow( pParent, nWinStyle ) { @@ -186,135 +169,95 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : xRecognizer->addDragGestureListener( Reference< XDragGestureListener > ( xListener, UNO_QUERY ) ); } - - void MyWin::MouseMove( const MouseEvent& rMEvt ) { WorkWindow::MouseMove( rMEvt ); } - - void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) { WorkWindow::MouseButtonDown( rMEvt ); } - - void MyWin::MouseButtonUp( const MouseEvent& rMEvt ) { WorkWindow::MouseButtonUp( rMEvt ); } - - void MyWin::KeyInput( const KeyEvent& rKEvt ) { WorkWindow::KeyInput( rKEvt ); } - - void MyWin::KeyUp( const KeyEvent& rKEvt ) { WorkWindow::KeyUp( rKEvt ); } - - void MyWin::Paint( const Rectangle& rRect ) { WorkWindow::Paint( rRect ); } - - void MyWin::Resize() { WorkWindow::Resize(); } - - void SAL_CALL MyDragAndDropListener::dragGestureRecognized( const DragGestureEvent& dge ) throw(RuntimeException) { Reference< XDragSource > xDragSource( dge.DragSource, UNO_QUERY ); xDragSource->startDrag( dge, -1, 0, 0, new StringTransferable( OUString("TestString") ), this ); } - - void SAL_CALL MyDragAndDropListener::drop( const DropTargetDropEvent& dtde ) throw(RuntimeException) { dtde.Context->dropComplete( true ); } - - void SAL_CALL MyDragAndDropListener::dragEnter( const DropTargetDragEnterEvent& dtdee ) throw(RuntimeException) { dtdee.Context->acceptDrag( dtdee.DropAction ); } - - void SAL_CALL MyDragAndDropListener::dragExit( const DropTargetEvent& ) throw(RuntimeException) { } - - void SAL_CALL MyDragAndDropListener::dragOver( const DropTargetDragEvent& dtde ) throw(RuntimeException) { dtde.Context->acceptDrag( dtde.DropAction ); } - - void SAL_CALL MyDragAndDropListener::dropActionChanged( const DropTargetDragEvent& dtde ) throw(RuntimeException) { dtde.Context->acceptDrag( dtde.DropAction ); } - - void SAL_CALL MyDragAndDropListener::dragDropEnd( const DragSourceDropEvent& ) throw(RuntimeException) { } - - void SAL_CALL MyDragAndDropListener::dragEnter( const DragSourceDragEvent& ) throw(RuntimeException) { } - - void SAL_CALL MyDragAndDropListener::dragExit( const DragSourceEvent& ) throw(RuntimeException) { } - - void SAL_CALL MyDragAndDropListener::dragOver( const DragSourceDragEvent& ) throw(RuntimeException) { } - - void SAL_CALL MyDragAndDropListener::dropActionChanged( const DragSourceDragEvent& ) throw(RuntimeException) { } - - void SAL_CALL MyDragAndDropListener::disposing( const EventObject& ) throw(RuntimeException) { } - - MyInfoBox::MyInfoBox( Window* pParent ) : InfoBox( pParent, OUString("dragging over this box should result in another window id in the drag log.") ) { @@ -332,8 +275,6 @@ MyInfoBox::MyInfoBox( Window* pParent ) : InfoBox( pParent, xRecognizer->addDragGestureListener( Reference< XDragGestureListener > ( xListener, UNO_QUERY ) ); }; - - MyListBox::MyListBox( Window* pParent ) : ListBox( pParent ) { Reference< XDropTargetListener > xListener = new MyDragAndDropListener( this ); @@ -350,24 +291,18 @@ MyListBox::MyListBox( Window* pParent ) : ListBox( pParent ) xRecognizer->addDragGestureListener( Reference< XDragGestureListener > ( xListener, UNO_QUERY ) ); }; - - Any SAL_CALL StringTransferable::getTransferData( const DataFlavor& ) throw(UnsupportedFlavorException, IOException, RuntimeException) { return makeAny( m_aData ); } - - Sequence< DataFlavor > SAL_CALL StringTransferable::getTransferDataFlavors( ) throw(RuntimeException) { return m_aFlavorList; } - - bool SAL_CALL StringTransferable::isDataFlavorSupported( const DataFlavor& ) throw(RuntimeException) { diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-test.cxx index fe672d098438..48b1045f14b7 100644 --- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx +++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx @@ -44,7 +44,6 @@ public: void testScaling(); void testExportImport(); - CPPUNIT_TEST_SUITE(VclFiltersTest); CPPUNIT_TEST(testCVEs); CPPUNIT_TEST(testScaling); diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index ce44ca8e1e8e..029caed18702 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -37,8 +37,6 @@ #include "basegfx/polygon/b2dpolygon.hxx" #include "basegfx/matrix/b2dhommatrix.hxx" - - inline double toRadian(int nDegree) { return nDegree * (M_PI / 1800.0); @@ -111,16 +109,12 @@ CoreTextStyle::CoreTextStyle( const FontSelectPattern& rFSD ) #endif } - - CoreTextStyle::~CoreTextStyle( void ) { if( mpStyleDict ) CFRelease( mpStyleDict ); } - - void CoreTextStyle::GetFontMetric( ImplFontMetricData& rMetric ) const { // get the matching CoreText font handle @@ -141,8 +135,6 @@ void CoreTextStyle::GetFontMetric( ImplFontMetricData& rMetric ) const rMetric.mbKernableFont = true; } - - bool CoreTextStyle::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) const { CGGlyph nCGGlyph = aGlyphId & GF_IDXMASK; @@ -159,8 +151,6 @@ bool CoreTextStyle::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) return true; } - - // callbacks from CTFontCreatePathForGlyph+CGPathApply for GetGlyphOutline() struct GgoData { basegfx::B2DPolygon maPolygon; basegfx::B2DPolyPolygon* mpPolyPoly; }; @@ -221,8 +211,6 @@ bool CoreTextStyle::GetGlyphOutline( sal_GlyphId aGlyphId, basegfx::B2DPolyPolyg return true; } - - void CoreTextStyle::SetTextColor( const RGBAColor& rColor ) { CGFloat aColor[] = { rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue(), rColor.GetAlpha() }; @@ -233,29 +221,21 @@ void CoreTextStyle::SetTextColor( const RGBAColor& rColor ) CFRelease( pCGColor); } - - PhysicalFontFace* CoreTextFontData::Clone( void ) const { return new CoreTextFontData( *this); } - - CoreTextStyle* CoreTextFontData::CreateTextStyle( const FontSelectPattern& rFSD ) const { return new CoreTextStyle( rFSD); } - - ImplFontEntry* CoreTextFontData::CreateFontInstance( /*const*/ FontSelectPattern& rFSD ) const { return new ImplFontEntry( rFSD); } - - int CoreTextFontData::GetFontTable( const char pTagName[5], unsigned char* pResultBuf ) const { DBG_ASSERT( pTagName[4]=='\0', "CoreTextFontData::GetFontTable with invalid tagname!\n" ); @@ -289,8 +269,6 @@ int CoreTextFontData::GetFontTable( const char pTagName[5], unsigned char* pResu return (int)nByteLength; } - - ImplDevFontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef pFD, bool* bFontEnabled ) { // all CoreText fonts are device fonts that can rotate just fine @@ -424,15 +402,11 @@ static void CTFontEnumCallBack( const void* pValue, void* pContext ) } } - - SystemFontList::SystemFontList() : mpCTFontCollection( NULL ) , mpCTFontArray( NULL ) {} - - SystemFontList::~SystemFontList() { CTFontContainer::const_iterator it = maFontContainer.begin(); @@ -446,16 +420,12 @@ SystemFontList::~SystemFontList() CFRelease( mpCTFontCollection ); } - - void SystemFontList::AddFont( CoreTextFontData* pFontData ) { sal_IntPtr nFontId = pFontData->GetFontId(); maFontContainer[ nFontId ] = pFontData; } - - void SystemFontList::AnnounceFonts( PhysicalFontCollection& rFontCollection ) const { CTFontContainer::const_iterator it = maFontContainer.begin(); @@ -463,8 +433,6 @@ void SystemFontList::AnnounceFonts( PhysicalFontCollection& rFontCollection ) co rFontCollection.Add( (*it).second->Clone() ); } - - CoreTextFontData* SystemFontList::GetFontDataFromId( sal_IntPtr nFontId ) const { CTFontContainer::const_iterator it = maFontContainer.find( nFontId ); @@ -473,8 +441,6 @@ CoreTextFontData* SystemFontList::GetFontDataFromId( sal_IntPtr nFontId ) const return (*it).second; } - - bool SystemFontList::Init( void ) { // enumerate available system fonts @@ -493,8 +459,6 @@ bool SystemFontList::Init( void ) return true; } - - SystemFontList* GetCoretextFontList( void ) { SystemFontList* pList = new SystemFontList(); diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx index e0a57d3caf59..5ecc507a6780 100644 --- a/vcl/quartz/salbmp.cxx +++ b/vcl/quartz/salbmp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "basebmp/scanlineformats.hxx" #include "basebmp/color.hxx" @@ -47,15 +46,11 @@ static const unsigned long k32BitRedColorMask = 0x00ff0000; static const unsigned long k32BitGreenColorMask = 0x0000ff00; static const unsigned long k32BitBlueColorMask = 0x000000ff; - - static bool isValidBitCount( sal_uInt16 nBitCount ) { return (nBitCount == 1) || (nBitCount == 4) || (nBitCount == 8) || (nBitCount == 16) || (nBitCount == 24) || (nBitCount == 32); } - - QuartzSalBitmap::QuartzSalBitmap() : mxGraphicContext( NULL ) , mxCachedImage( NULL ) @@ -66,15 +61,11 @@ QuartzSalBitmap::QuartzSalBitmap() { } - - QuartzSalBitmap::~QuartzSalBitmap() { Destroy(); } - - bool QuartzSalBitmap::Create( CGLayerRef xLayer, int nBitmapBits, int nX, int nY, int nWidth, int nHeight ) { @@ -123,22 +114,16 @@ bool QuartzSalBitmap::Create( const Size& rSize, sal_uInt16 nBits, const BitmapP return AllocateUserData(); } - - bool QuartzSalBitmap::Create( const SalBitmap& rSalBmp ) { return Create( rSalBmp, rSalBmp.GetBitCount() ); } - - bool QuartzSalBitmap::Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics ) { return Create( rSalBmp, pGraphics ? pGraphics->GetBitCount() : rSalBmp.GetBitCount() ); } - - bool QuartzSalBitmap::Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount ) { const QuartzSalBitmap& rSourceBitmap = static_cast<const QuartzSalBitmap&>(rSalBmp); @@ -159,23 +144,17 @@ bool QuartzSalBitmap::Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount return false; } - - bool QuartzSalBitmap::Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > /*xBitmapCanvas*/, Size& /*rSize*/, bool /*bMask*/ ) { return false; } - - void QuartzSalBitmap::Destroy() { DestroyContext(); maUserBuffer.reset(); } - - void QuartzSalBitmap::DestroyContext() { if( mxCachedImage ) @@ -194,8 +173,6 @@ void QuartzSalBitmap::DestroyContext() } } - - bool QuartzSalBitmap::CreateContext() { DestroyContext(); @@ -259,8 +236,6 @@ bool QuartzSalBitmap::CreateContext() return mxGraphicContext != NULL; } - - bool QuartzSalBitmap::AllocateUserData() { Destroy(); @@ -297,8 +272,6 @@ bool QuartzSalBitmap::AllocateUserData() return maUserBuffer.get() != 0; } - - class ImplPixelFormat { protected: @@ -573,22 +546,16 @@ void QuartzSalBitmap::ConvertBitmapData( sal_uInt32 nWidth, sal_uInt32 nHeight, } } - - Size QuartzSalBitmap::GetSize() const { return Size( mnWidth, mnHeight ); } - - sal_uInt16 QuartzSalBitmap::GetBitCount() const { return mnBits; } - - static struct pal_entry { sal_uInt8 mnRed; @@ -716,8 +683,6 @@ BitmapBuffer* QuartzSalBitmap::AcquireBuffer( bool /*bReadOnly*/ ) return pBuffer; } - - void QuartzSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) { // invalidate graphic context if we have different data @@ -731,8 +696,6 @@ void QuartzSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) delete pBuffer; } - - CGImageRef QuartzSalBitmap::CreateCroppedImage( int nX, int nY, int nNewWidth, int nNewHeight ) const { if( !mxCachedImage ) @@ -763,8 +726,6 @@ CGImageRef QuartzSalBitmap::CreateCroppedImage( int nX, int nY, int nNewWidth, i return xCroppedImage; } - - static void CFRTLFree(void* /*info*/, const void* data, size_t /*size*/) { rtl_freeMemory( const_cast<void*>(data) ); @@ -821,8 +782,6 @@ CGImageRef QuartzSalBitmap::CreateWithMask( const QuartzSalBitmap& rMask, return xMaskedImage; } - - /** creates an image from the given rectangle, replacing all black pixels with nMaskColor and make all other full transparent */ CGImageRef QuartzSalBitmap::CreateColorMask( int nX, int nY, int nWidth, int nHeight, SalColor nMaskColor ) const { @@ -875,8 +834,6 @@ CGImageRef QuartzSalBitmap::CreateColorMask( int nX, int nY, int nWidth, int nHe return xMask; } - - /** QuartzSalBitmap::GetSystemData Get platform native image data from existing image * * @param rData struct BitmapSystemData, defined in vcl/inc/bitmap.hxx diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index 1ab0931afb3d..4a346df57e04 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -57,11 +57,8 @@ #include "sallayout.hxx" #include "sft.hxx" - using namespace vcl; - - CoreTextFontData::CoreTextFontData( const CoreTextFontData& rSrc ) : PhysicalFontFace( rSrc ) , mnFontId( rSrc.mnFontId ) @@ -74,8 +71,6 @@ CoreTextFontData::CoreTextFontData( const CoreTextFontData& rSrc ) mpCharMap->AddReference(); } - - CoreTextFontData::CoreTextFontData( const ImplDevFontAttributes& rDFA, sal_IntPtr nFontId ) : PhysicalFontFace( rDFA, 0 ) , mnFontId( nFontId ) @@ -87,23 +82,17 @@ CoreTextFontData::CoreTextFontData( const ImplDevFontAttributes& rDFA, sal_IntPt { } - - CoreTextFontData::~CoreTextFontData() { if( mpCharMap ) mpCharMap->DeReference(); } - - sal_IntPtr CoreTextFontData::GetFontId() const { return (sal_IntPtr)mnFontId; } - - static unsigned GetUShort( const unsigned char* p ){return((p[0]<<8)+p[1]);} const ImplFontCharMap* CoreTextFontData::GetImplFontCharMap() const @@ -189,8 +178,6 @@ bool CoreTextFontData::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapab return !rFontCapabilities.maUnicodeRange.empty() || !rFontCapabilities.maCodePageRange.empty(); } - - void CoreTextFontData::ReadOs2Table( void ) const { // read this only once per font @@ -337,15 +324,11 @@ void AquaSalGraphics::SetTextColor( SalColor nSalColor ) mpTextStyle->SetTextColor( maTextColor ); } - - void AquaSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int /*nFallbackLevel*/ ) { mpTextStyle->GetFontMetric( *pMetric ); } - - static bool AddTempDevFont(const OUString& rFontFileURL) { OUString aUSytemPath; @@ -444,38 +427,28 @@ void AquaSalGraphics::ClearDevFontCache() pSalData->mpFontList = NULL; } - - bool AquaSalGraphics::AddTempDevFont( PhysicalFontCollection*, const OUString& rFontFileURL, const OUString& /*rFontName*/ ) { return ::AddTempDevFont(rFontFileURL); } - - bool AquaSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, basegfx::B2DPolyPolygon& rPolyPoly ) { const bool bRC = mpTextStyle->GetGlyphOutline( aGlyphId, rPolyPoly ); return bRC; } - - bool AquaSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) { const bool bRC = mpTextStyle->GetGlyphBoundRect( aGlyphId, rRect ); return bRC; } - - void AquaSalGraphics::DrawServerFontLayout( const ServerFontLayout& ) { } - - sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern* pReqFont, int /*nFallbackLevel*/ ) { // release the text style @@ -510,16 +483,12 @@ sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern* pReqFont, int /*nFallbac return 0; } - - SalLayout* AquaSalGraphics::GetTextLayout( ImplLayoutArgs& /*rArgs*/, int /*nFallbackLevel*/ ) { SalLayout* pSalLayout = mpTextStyle->GetTextLayout(); return pSalLayout; } - - const ImplFontCharMap* AquaSalGraphics::GetImplFontCharMap() const { if( !mpFontData ) @@ -536,8 +505,6 @@ bool AquaSalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabi return mpFontData->GetImplFontCapabilities(rFontCapabilities); } - - // fake a SFNT font directory entry for a font table // see http://developer.apple.com/fonts/TTRefMan/RM06/Chap6.html#Directory static void FakeDirEntry( const char aTag[5], ByteCount nOfs, ByteCount nLen, @@ -720,8 +687,6 @@ bool AquaSalGraphics::GetRawFontData( const PhysicalFontFace* pFontData, return true; } - - void AquaSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFontData, bool bVertical, Int32Vector& rGlyphWidths, Ucs2UIntMap& rUnicodeEnc ) { @@ -791,16 +756,12 @@ void AquaSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFontData, bool bV } } - - const Ucs2SIntMap* AquaSalGraphics::GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** /*ppNonEncoded*/ ) { return NULL; } - - const void* AquaSalGraphics::GetEmbedFontData( const PhysicalFontFace*, const sal_Ucs* /*pUnicodes*/, sal_Int32* /*pWidths*/, @@ -810,8 +771,6 @@ const void* AquaSalGraphics::GetEmbedFontData( const PhysicalFontFace*, return NULL; } - - void AquaSalGraphics::FreeEmbedFontData( const void* pData, long /*nDataLen*/ ) { // TODO: implementing this only makes sense when the implementation of @@ -820,8 +779,6 @@ void AquaSalGraphics::FreeEmbedFontData( const void* pData, long /*nDataLen*/ ) DBG_ASSERT( (pData!=NULL), "AquaSalGraphics::FreeEmbedFontData() is not implemented\n"); } - - SystemFontData AquaSalGraphics::GetSysFontData( int /* nFallbacklevel */ ) const { SystemFontData aSysFontData; diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index de28d5a67994..71346758cad4 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -619,7 +619,6 @@ bool AquaSalGraphics::drawTransformedBitmap( return true; } - bool AquaSalGraphics::drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) { @@ -1585,7 +1584,6 @@ void AquaSalGraphics::Pattern50Fill() CGContextFillPath( mrContext ); } - void AquaSalGraphics::ResetClipRegion() { // release old path and indicate no clipping @@ -1810,8 +1808,6 @@ void AquaSalGraphics::updateResolution() #endif - - XorEmulation::XorEmulation() : m_xTargetLayer( NULL ) , m_xTargetContext( NULL ) diff --git a/vcl/quartz/salgdiutils.cxx b/vcl/quartz/salgdiutils.cxx index 229c3437d80c..cd2341386655 100644 --- a/vcl/quartz/salgdiutils.cxx +++ b/vcl/quartz/salgdiutils.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "basebmp/scanlineformats.hxx" #include "basebmp/color.hxx" @@ -33,8 +32,6 @@ #include "osx/salframe.h" #include "osx/saldata.hxx" - - void AquaSalGraphics::SetWindowGraphics( AquaSalFrame* pFrame ) { mpFrame = pFrame; @@ -76,8 +73,6 @@ void AquaSalGraphics::InvalidateContext() mrContext = 0; } - - void AquaSalGraphics::UnsetState() { if( mrContext ) @@ -205,6 +200,4 @@ void AquaSalGraphics::UpdateWindow( NSRect& ) DBG_ASSERT( mpFrame->mbInitShow, "UpdateWindow called on uneligible graphics" ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx index 543fc5d60289..5894ce11374f 100644 --- a/vcl/quartz/salvd.cxx +++ b/vcl/quartz/salvd.cxx @@ -101,8 +101,6 @@ AquaSalVirtualDevice::AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX, } } - - AquaSalVirtualDevice::~AquaSalVirtualDevice() { SAL_INFO( "vcl.virdev", "AquaSalVirtualDevice::~AquaSalVirtualDevice() this=" << this ); @@ -115,8 +113,6 @@ AquaSalVirtualDevice::~AquaSalVirtualDevice() Destroy(); } - - void AquaSalVirtualDevice::Destroy() { SAL_INFO( "vcl.virdev", "AquaSalVirtualDevice::Destroy() this=" << this << " mbForeignContext=" << mbForeignContext ); @@ -146,8 +142,6 @@ void AquaSalVirtualDevice::Destroy() } } - - SalGraphics* AquaSalVirtualDevice::AcquireGraphics() { if( mbGraphicsUsed || !mpGraphics ) @@ -157,15 +151,11 @@ SalGraphics* AquaSalVirtualDevice::AcquireGraphics() return mpGraphics; } - - void AquaSalVirtualDevice::ReleaseGraphics( SalGraphics* ) { mbGraphicsUsed = false; } - - bool AquaSalVirtualDevice::SetSize( long nDX, long nDY ) { SAL_INFO( "vcl.virdev", "AquaSalVirtualDevice::SetSize() this=" << this << " (" << nDX << "x" << nDY << ")" << " mbForeignContext=" << mbForeignContext ); @@ -280,8 +270,6 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY ) return (mxLayer != NULL); } - - void AquaSalVirtualDevice::GetSize( long& rWidth, long& rHeight ) { if( mxLayer ) diff --git a/vcl/source/app/IconThemeScanner.cxx b/vcl/source/app/IconThemeScanner.cxx index 152dbdca4646..9684bb6d7b0a 100644 --- a/vcl/source/app/IconThemeScanner.cxx +++ b/vcl/source/app/IconThemeScanner.cxx @@ -183,7 +183,6 @@ IconThemeScanner::GetIconThemeInfo(const OUString& themeId) return *info; } - } // end namespace vcl /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx index 023745bf9bcd..4f8b4e591791 100644 --- a/vcl/source/app/IconThemeSelector.cxx +++ b/vcl/source/app/IconThemeSelector.cxx @@ -22,7 +22,6 @@ IconThemeSelector::HIGH_CONTRAST_ICON_THEME_ID("hicontrast"); /*static*/ const OUString IconThemeSelector::FALLBACK_ICON_THEME_ID("tango"); - namespace { class SameTheme : diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 29067fb24a23..ae084a7b0cf4 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -225,7 +225,6 @@ private: void GetAssertionEntryRange( sal_uInt16 nInbetweenEntry, sal_uInt16& nFirst, sal_uInt16& nLast ); }; - class DbgInfoDialog : public ModalDialog { private: @@ -239,7 +238,6 @@ public: void SetInfoText( const OUString& rStr ); }; - class DbgDialog : public ModalDialog { private: diff --git a/vcl/source/app/dndhelp.cxx b/vcl/source/app/dndhelp.cxx index 05c2f9d12562..7b056828893c 100644 --- a/vcl/source/app/dndhelp.cxx +++ b/vcl/source/app/dndhelp.cxx @@ -89,8 +89,6 @@ void vcl::unohelper::DragAndDropClient::dropActionChanged( const ::com::sun::sta { } - - vcl::unohelper::DragAndDropWrapper::DragAndDropWrapper( DragAndDropClient* pClient ) { mpClient = pClient; @@ -119,7 +117,6 @@ void vcl::unohelper::DragAndDropWrapper::disposing( const ::com::sun::star::lang mpClient = NULL; } - // ::com::sun::star::datatransfer::dnd::XDragGestureListener void vcl::unohelper::DragAndDropWrapper::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& rDGE ) throw (::com::sun::star::uno::RuntimeException, std::exception) { diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 77b655ab65d5..b84364e00b24 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -464,7 +464,6 @@ OUString HelpTextWindow::GetText() const return FloatingWindow::CreateAccessible(); } - void ImplShowHelpWindow( Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, const OUString& rHelpText, const OUString& rStatusText, const Point& rScreenPos, const Rectangle* pHelpArea ) diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx index 40585a81ed71..6796e6359a72 100644 --- a/vcl/source/app/i18nhelp.cxx +++ b/vcl/source/app/i18nhelp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "comphelper/processfactory.hxx" #include "unotools/localedatawrapper.hxx" #include "unotools/transliterationwrapper.hxx" @@ -124,7 +123,6 @@ sal_Int32 vcl::I18nHelper::CompareString( const OUString& rStr1, const OUString& ((vcl::I18nHelper*)this)->mpTransliterationWrapper = NULL; } - OUString aStr1( filterFormattingChars(rStr1) ); OUString aStr2( filterFormattingChars(rStr2) ); return ImplGetTransliterationWrapper().compareString( aStr1, aStr2 ); @@ -162,7 +160,6 @@ bool vcl::I18nHelper::MatchMnemonic( const OUString& rString, sal_Unicode cMnemo return bEqual; } - OUString vcl::I18nHelper::GetNum( long nNumber, sal_uInt16 nDecimals, bool bUseThousandSep, bool bTrailingZeros ) const { return ImplGetLocaleDataWrapper().getNum( nNumber, nDecimals, bUseThousandSep, bTrailingZeros ); diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 3c0a0f526eb3..cbde0d4bf038 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <salframe.hxx> #include <salinst.hxx> #include <salvd.hxx> @@ -36,8 +35,6 @@ SalFrame::~SalFrame() { } - - // default to full-frame flushes // on ports where partial-flushes are much cheaper this method should be overridden void SalFrame::Flush( const Rectangle& ) @@ -45,15 +42,11 @@ void SalFrame::Flush( const Rectangle& ) Flush(); } - - void SalFrame::SetRepresentedURL( const OUString& ) { // currently this is Mac only functionality } - - SalInstance::~SalInstance() { } diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index cf430b4a08ff..ac6e6c4bb810 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -41,7 +41,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::frame; - SalSession::~SalSession() { } diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index b175108381c0..ad9bfa11f292 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -78,7 +78,6 @@ struct ImplMouseData sal_uInt16 mnWheelBehavior; }; - struct ImplStyleData { ImplStyleData(); @@ -207,7 +206,6 @@ struct ImplStyleData boost::optional<Color> maPersonaMenuBarTextColor; ///< Cache the menubar color. }; - struct ImplMiscData { ImplMiscData(); @@ -217,7 +215,6 @@ struct ImplMiscData TriState mnDisablePrinting; }; - struct ImplHelpData { ImplHelpData(); @@ -430,7 +427,6 @@ MouseSettings::GetMenuDelay() const return mpData->mnMenuDelay; } - void MouseSettings::SetFollow( sal_uLong nFollow ) { @@ -444,7 +440,6 @@ MouseSettings::GetFollow() const return mpData->mnFollow; } - void MouseSettings::SetMiddleButtonAction( sal_uInt16 nAction ) { @@ -482,8 +477,6 @@ MouseSettings::MouseSettings() { } - - MouseSettings::~MouseSettings() { } @@ -1363,7 +1356,6 @@ StyleSettings::GetMonoColor() const return mpData->maMonoColor; } - void StyleSettings::SetActiveTabColor( const Color& rColor ) { @@ -1501,7 +1493,6 @@ StyleSettings::GetPrimaryButtonWarpsSlider() const return mpData->mbPrimaryButtonWarpsSlider; } - void StyleSettings::SetCairoFontOptions( const void *pOptions ) { @@ -1515,7 +1506,6 @@ StyleSettings::GetCairoFontOptions() const return mpData->mpFontOptions; } - void StyleSettings::SetAppFont( const Font& rFont ) { @@ -1794,7 +1784,6 @@ StyleSettings::GetCursorBlinkTime() const return (long) mpData->mnCursorBlinkTime; } - void StyleSettings::SetScreenZoom( sal_uInt16 nPercent ) { @@ -1847,7 +1836,6 @@ StyleSettings::GetSelectionOptions() const return mpData->mnSelectionOptions; } - void StyleSettings::SetDisplayOptions( sal_uLong nOptions ) { @@ -1874,7 +1862,6 @@ StyleSettings::GetAntialiasingMinPixelHeight() const return mpData->mnAntialiasedMin; } - void StyleSettings::SetOptions( sal_uLong nOptions ) { @@ -1895,7 +1882,6 @@ StyleSettings::GetAutoMnemonic() const return mpData->mbAutoMnemonic; } - void StyleSettings::SetFontColor( const Color& rColor ) { @@ -1909,7 +1895,6 @@ StyleSettings::GetFontColor() const return mpData->maFontColor; } - void StyleSettings::SetToolbarIconSize( sal_uLong nSize ) { @@ -1936,7 +1921,6 @@ StyleSettings::SetDialogStyle( const DialogStyle& rStyle ) mpData->maDialogStyle = rStyle; } - const FrameStyle& StyleSettings::GetFrameStyle() const { diff --git a/vcl/source/app/sound.cxx b/vcl/source/app/sound.cxx index 308f37f8c57f..226d09fb345c 100644 --- a/vcl/source/app/sound.cxx +++ b/vcl/source/app/sound.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/sound.hxx> diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx index 4758a2533189..edd115d0befa 100644 --- a/vcl/source/app/stdtext.cxx +++ b/vcl/source/app/stdtext.cxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/msgbox.hxx> #include <vcl/stdtext.hxx> #include <svids.hrc> #include <svdata.hxx> - OUString GetStandardText( sal_uInt16 nStdText ) { ResMgr* pResMgr = ImplGetResMgr(); diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 21a3d1a7a4e7..b899ec73816d 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -303,8 +303,6 @@ bool ImplInitAccessBridge() return true; } - - Window* ImplFindWindow( const SalFrame* pFrame, ::Point& rSalFramePos ) { ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx index 2f4ff80eee25..f83f55ceb14e 100644 --- a/vcl/source/app/timer.cxx +++ b/vcl/source/app/timer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/time.hxx> #include <vcl/svapp.hxx> @@ -27,7 +26,6 @@ #include <svdata.hxx> #include <salinst.hxx> - #define MAX_TIMER_PERIOD ((sal_uLong)0xFFFFFFFF) struct ImplTimerData diff --git a/vcl/source/app/unohelp2.cxx b/vcl/source/app/unohelp2.cxx index ccaa289219c2..7dc274cffb00 100644 --- a/vcl/source/app/unohelp2.cxx +++ b/vcl/source/app/unohelp2.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp> - using namespace ::com::sun::star; namespace vcl { namespace unohelper { diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx index 50c6b00c9cdd..8d5b69ae96c3 100644 --- a/vcl/source/app/vclevent.cxx +++ b/vcl/source/app/vclevent.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/vclevent.hxx" #include "svdata.hxx" diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index c584aad08b31..35065ad43975 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "osl/mutex.hxx" #include "vcl/svapp.hxx" @@ -207,8 +206,6 @@ void GenericClipboard::removeClipboardListener( const Reference< datatransfer::c m_aListeners.remove( listener ); } - - class ClipboardFactory : public ::cppu::WeakComponentImplHelper1< com::sun::star::lang::XSingleServiceFactory > @@ -225,8 +222,6 @@ public: virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& rArgs ) throw(std::exception) SAL_OVERRIDE; }; - - ClipboardFactory::ClipboardFactory() : cppu::WeakComponentImplHelper1< com::sun::star::lang::XSingleServiceFactory @@ -234,21 +229,15 @@ ClipboardFactory::ClipboardFactory() : { } - - ClipboardFactory::~ClipboardFactory() { } - - Reference< XInterface > ClipboardFactory::createInstance() throw(std::exception) { return createInstanceWithArguments( Sequence< Any >() ); } - - Reference< XInterface > ClipboardFactory::createInstanceWithArguments( const Sequence< Any >& arguments ) throw(std::exception) { SolarMutexGuard aGuard; @@ -345,7 +334,6 @@ void GenericDragSource::initialize( const Sequence< Any >& ) throw( Exception, s { } - Sequence< OUString > SAL_CALL DragSource_getSupportedServiceNames() { #if defined UNX @@ -498,7 +486,6 @@ Reference< XInterface > SAL_CALL DropTarget_createInstance( const Reference< XMu return xResult; } - } // namespace vcl /* diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index 7eb2f1f86ff2..4bfba8a3e94e 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/svapp.hxx" #include "vcl/font.hxx" @@ -41,8 +40,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::awt; - - namespace vcl { @@ -53,7 +50,6 @@ public: FontIdentificator() {} virtual ~FontIdentificator(); - // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL supportsService( const OUString& ) throw (RuntimeException, std::exception) SAL_OVERRIDE; @@ -67,8 +63,6 @@ FontIdentificator() {} }; - - FontIdentificator::~FontIdentificator() { } diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 3086de5cbb40..4638bd04a24e 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/debug.hxx> #include <tools/lineend.hxx> #include <tools/poly.hxx> @@ -42,8 +41,6 @@ #include <window.h> #include <controldata.hxx> - - #define PUSHBUTTON_VIEW_STYLE (WB_3DLOOK | \ WB_LEFT | WB_CENTER | WB_RIGHT | \ WB_TOP | WB_VCENTER | WB_BOTTOM | \ @@ -60,8 +57,6 @@ WB_TOP | WB_VCENTER | WB_BOTTOM | \ WB_WORDBREAK | WB_NOLABEL) - - class ImplCommonButtonData { public: @@ -79,7 +74,6 @@ public: ~ImplCommonButtonData(); }; - ImplCommonButtonData::ImplCommonButtonData() : maFocusRect(), mnSeparatorX(0), mnButtonState(0), mbSmallSymbol(false), maImage(), meImageAlign(IMAGEALIGN_TOP), meSymbolAlign(SYMBOLALIGN_LEFT) { @@ -95,7 +89,6 @@ Button::Button( WindowType nType ) : mpButtonData = new ImplCommonButtonData; } - Button::~Button() { delete mpButtonData; @@ -149,7 +142,6 @@ OUString Button::GetStandardText( StandardButtonType eButton ) return ResId(nResId, *pResMgr).toString(); } - bool Button::SetModeImage( const Image& rImage ) { if ( rImage != mpButtonData->maImage ) @@ -161,13 +153,11 @@ bool Button::SetModeImage( const Image& rImage ) return true; } - const Image Button::GetModeImage( ) const { return mpButtonData->maImage; } - bool Button::HasImage() const { return !!(mpButtonData->maImage); @@ -1080,8 +1070,6 @@ void PushButton::ImplDrawPushButton( bool bLayout ) } } - - void PushButton::ImplSetDefButton( bool bSet ) { Size aSize( GetSizePixel() ); diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 8dd8022724c8..521d13ab1d97 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <set> #include <comphelper/string.hxx> #include <tools/debug.hxx> @@ -1362,7 +1361,6 @@ Rectangle ComboBox::GetBoundingRectangle( sal_Int32 nItem ) const return aRect; } - void ComboBox::SetBorderStyle( sal_uInt16 nBorderStyle ) { Window::SetBorderStyle( nBorderStyle ); @@ -1373,7 +1371,6 @@ void ComboBox::SetBorderStyle( sal_uInt16 nBorderStyle ) } } - long ComboBox::GetIndexForPoint( const Point& rPoint, sal_Int32& rPos ) const { if( !HasLayoutData() ) diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index e1bfbca514f0..6c9c3bb489d4 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <comphelper/processfactory.hxx> #include <tools/rc.h> @@ -71,7 +70,6 @@ Control::~Control() delete mpControlData, mpControlData = NULL; } - void Control::EnableRTL( bool bEnable ) { // convenience: for controls also switch layout mode @@ -338,7 +336,6 @@ void Control::SetLayoutDataParent( const Control* pParent ) const mpControlData->mpLayoutData->m_pParent = pParent; } - void Control::ImplClearLayoutData() const { delete mpControlData->mpLayoutData, mpControlData->mpLayoutData = NULL; diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 080353239de7..66082155c108 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/rc.h> #include <vcl/decoview.hxx> #include <vcl/event.hxx> @@ -36,7 +35,6 @@ #include <osl/mutex.hxx> - #include <com/sun/star/i18n/BreakIterator.hpp> #include <com/sun/star/i18n/CharacterIteratorMode.hpp> #include <com/sun/star/i18n/WordType.hpp> @@ -111,7 +109,6 @@ struct DDInfo } }; - struct Impl_IMEInfos { OUString aOldTextAfterStartPos; @@ -128,7 +125,6 @@ struct Impl_IMEInfos void DestroyAttribs(); }; - Impl_IMEInfos::Impl_IMEInfos(sal_Int32 nP, const OUString& rOldTextAfterStartPos) : aOldTextAfterStartPos(rOldTextAfterStartPos) { @@ -842,7 +838,6 @@ void Edit::ImplInsertText( const OUString& rStr, const Selection* pNewSel, bool aSelection.Min() > 0 && /* first char needs not to be checked */ xBI.is() && i18n::ScriptType::COMPLEX == xBI->getScriptType( rStr, 0 ); - uno::Reference < i18n::XExtendedInputSequenceChecker > xISC; if (bIsInputSequenceChecking && (xISC = ImplGetInputSequenceChecker()).is()) { @@ -2124,7 +2119,6 @@ void Edit::Command( const CommandEvent& rCEvt ) } } - if ( pData->GetTextAttr() ) { mpIMEInfos->CopyAttribs( pData->GetTextAttr(), pData->GetText().getLength() ); @@ -2839,7 +2833,6 @@ void Edit::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::Dra mpDDInfo->bStarterOfDD = true; mpDDInfo->aDndStartSel = aSel; - if ( IsTracking() ) EndTracking(); // Vor D&D Tracking ausschalten diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index b0ae9bb898f8..c70bf09a1f4a 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -39,7 +39,6 @@ #include <com/sun/star/i18n/XCharacterClassification.hpp> #include <com/sun/star/i18n/KCharacterType.hpp> - #include <unotools/localedatawrapper.hxx> #include <unotools/calendarwrapper.hxx> #include <unotools/charclass.hxx> @@ -1362,7 +1361,6 @@ void DateField::ImplDateSpinArea( bool bUp ) } } - switch( eFormat ) { case XTDATEF_SHORT_MMDDYY: diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index a336879f5d7e..7df62f8c606f 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/rc.h" #include "vcl/decoview.hxx" diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx index d9fdb2d75c67..97142fb6077b 100644 --- a/vcl/source/control/group.cxx +++ b/vcl/source/control/group.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/rc.h> #include <vcl/event.hxx> diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 4c0ba9dc4642..ee3d2a2733c3 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/debug.hxx> #include <vcl/svapp.hxx> @@ -76,8 +75,6 @@ void ImplInitFieldSettings( Window* pWin, bool bFont, bool bForeground, bool bBa } } - - void ImplInitDropDownButton( PushButton* pButton ) { if ( pButton->GetSettings().GetStyleSettings().GetOptions() & STYLE_OPTION_SPINUPDOWN ) @@ -491,7 +488,6 @@ sal_Int32 ImplEntryList::FindFirstSelectable( sal_Int32 nPos, bool bForward /* = return LISTBOX_ENTRY_NOTFOUND; } - ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) : Control( pParent, 0 ), maQuickSelectionEngine( *this ) @@ -1635,7 +1631,6 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) return bDone; } - namespace { static ::vcl::StringEntryIdentifier lcl_getEntry( const ImplEntryList& _rList, sal_Int32 _nPos, OUString& _out_entryText ) diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx index f143ab13331d..e49af86885e6 100644 --- a/vcl/source/control/imgctrl.cxx +++ b/vcl/source/control/imgctrl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/event.hxx> #include <vcl/imgctrl.hxx> #include <tools/rcid.h> diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index 4bd5e43fba47..ed5558dd045f 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -470,12 +470,10 @@ LongCurrencyField::LongCurrencyField( Window* pParent, WinBits nWinStyle ) : Reformat(); } - LongCurrencyField::~LongCurrencyField() { } - bool LongCurrencyField::PreNotify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_KEYINPUT ) @@ -486,7 +484,6 @@ bool LongCurrencyField::PreNotify( NotifyEvent& rNEvt ) return SpinField::PreNotify( rNEvt ); } - bool LongCurrencyField::Notify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_GETFOCUS ) @@ -504,14 +501,12 @@ bool LongCurrencyField::Notify( NotifyEvent& rNEvt ) return SpinField::Notify( rNEvt ); } - void LongCurrencyField::Modify() { MarkToBeReformatted( true ); SpinField::Modify(); } - void LongCurrencyField::Up() { BigInt nValue = GetValue(); @@ -534,14 +529,12 @@ void LongCurrencyField::Down() SpinField::Down(); } - void LongCurrencyField::First() { ImplNewLongCurrencyFieldValue( this, mnFirst ); SpinField::First(); } - void LongCurrencyField::Last() { ImplNewLongCurrencyFieldValue( this, mnLast ); @@ -569,7 +562,6 @@ bool LongCurrencyBox::PreNotify( NotifyEvent& rNEvt ) return ComboBox::PreNotify( rNEvt ); } - bool LongCurrencyBox::Notify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_GETFOCUS ) diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 6db3350c50a9..c978fe4d366f 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/rc.h" #include "tools/debug.hxx" @@ -48,14 +47,12 @@ ListBox::ListBox( WindowType nType ) : Control( nType ) ImplInitListBoxData(); } - ListBox::ListBox( Window* pParent, WinBits nStyle ) : Control( WINDOW_LISTBOX ) { ImplInitListBoxData(); ImplInit( pParent, nStyle ); } - ListBox::ListBox( Window* pParent, const ResId& rResId ) : Control( WINDOW_LISTBOX ) { @@ -69,7 +66,6 @@ ListBox::ListBox( Window* pParent, const ResId& rResId ) : Show(); } - ListBox::~ListBox() { ImplCallEventListeners( VCLEVENT_OBJECT_DYING ); @@ -85,7 +81,6 @@ ListBox::~ListBox() delete mpBtn; } - void ListBox::ImplInitListBoxData() { mpFloatWin = NULL; @@ -99,7 +94,6 @@ void ListBox::ImplInitListBoxData() mbEdgeBlending = false; } - void ListBox::ImplInit( Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); @@ -252,14 +246,12 @@ IMPL_LINK( ListBox, ImplListItemSelectHdl, void*, EMPTYARG ) return 1; } - IMPL_LINK_NOARG(ListBox, ImplScrollHdl) { ImplCallEventListeners( VCLEVENT_LISTBOX_SCROLLED ); return 1; } - IMPL_LINK_NOARG(ListBox, ImplCancelHdl) { if( IsInDropDown() ) @@ -268,7 +260,6 @@ IMPL_LINK_NOARG(ListBox, ImplCancelHdl) return 1; } - IMPL_LINK( ListBox, ImplSelectionChangedHdl, void*, n ) { if ( !mpImplLB->IsTrackingSelect() ) @@ -300,14 +291,12 @@ IMPL_LINK( ListBox, ImplSelectionChangedHdl, void*, n ) return 1; } - IMPL_LINK_NOARG(ListBox, ImplDoubleClickHdl) { DoubleClick(); return 1; } - IMPL_LINK_NOARG(ListBox, ImplClickBtnHdl) { if( !mpFloatWin->IsInPopupMode() ) @@ -560,7 +549,6 @@ void ListBox::DataChanged( const DataChangedEvent& rDCEvt ) ImplInitDropDownButton( mpBtn ); } - if ( IsDropDownBox() ) Invalidate(); } @@ -1506,7 +1494,6 @@ MultiListBox::MultiListBox( Window* pParent, WinBits nStyle ) : EnableMultiSelection( true ); } - MultiListBox::MultiListBox( Window* pParent, const ResId& rResId ) : ListBox( WINDOW_MULTILISTBOX ) { diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index 16955e89e5c0..7f263b685ae6 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/rc.h> #include <vcl/decoview.hxx> #include <vcl/event.hxx> @@ -74,7 +73,6 @@ OString MenuButton::GetCurItemIdent() const mpMenu->GetItemIdent(mnCurItemId) : OString(); } - MenuButton::MenuButton( Window* pParent, WinBits nWinBits ) : PushButton( WINDOW_MENUBUTTON ) { @@ -128,7 +126,6 @@ IMPL_LINK_NOARG(MenuButton, ImplMenuTimeoutHdl) return 0; } - void MenuButton::MouseButtonDown( const MouseEvent& rMEvt ) { bool bExecute = true; @@ -162,7 +159,6 @@ void MenuButton::MouseButtonDown( const MouseEvent& rMEvt ) } } - void MenuButton::KeyInput( const KeyEvent& rKEvt ) { KeyCode aKeyCode = rKEvt.GetKeyCode(); @@ -177,19 +173,16 @@ void MenuButton::KeyInput( const KeyEvent& rKEvt ) PushButton::KeyInput( rKEvt ); } - void MenuButton::Activate() { maActivateHdl.Call( this ); } - void MenuButton::Select() { maSelectHdl.Call( this ); } - void MenuButton::SetMenuMode( sal_uInt16 nMode ) { // FIXME: It's better to not inline this for 5.1; in 6.0 we can make it inline, however diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx index c14df7b195df..8bbaafcede8c 100644 --- a/vcl/source/control/prgsbar.cxx +++ b/vcl/source/control/prgsbar.cxx @@ -126,7 +126,6 @@ void ProgressBar::ImplInitSettings( bool bFont, } } - void ProgressBar::ImplDrawProgress( sal_uInt16 nOldPerc, sal_uInt16 nNewPerc ) { if ( mbCalcNew ) @@ -161,7 +160,6 @@ void ProgressBar::Paint( const Rectangle& ) ImplDrawProgress( 0, mnPercent ); } - void ProgressBar::Resize() { mbCalcNew = true; diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx index d0b72391261f..25d136a0218e 100644 --- a/vcl/source/control/quickselectionengine.cxx +++ b/vcl/source/control/quickselectionengine.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/quickselectionengine.hxx" #include "vcl/event.hxx" #include "vcl/timer.hxx" diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index fcd035cb27f8..32d977702fde 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/event.hxx" #include "vcl/decoview.hxx" #include "vcl/scrbar.hxx" @@ -1368,7 +1367,6 @@ void ScrollBar::SetRangeMin( long nNewRange ) SetRange( Range( nNewRange, GetRangeMax() ) ); } - void ScrollBar::SetRangeMax( long nNewRange ) { SetRange( Range( GetRangeMin(), nNewRange ) ); diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index a52ede4551ce..f398d02a38e3 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/rc.h> #include <vcl/event.hxx> #include <vcl/decoview.hxx> @@ -26,8 +25,6 @@ #include "thumbpos.hxx" - - #define SLIDER_DRAW_THUMB ((sal_uInt16)0x0001) #define SLIDER_DRAW_CHANNEL1 ((sal_uInt16)0x0002) #define SLIDER_DRAW_CHANNEL2 ((sal_uInt16)0x0004) @@ -48,8 +45,6 @@ #define SLIDER_VIEW_STYLE (WB_3DLOOK | WB_HORZ | WB_VERT) - - void Slider::ImplInit( Window* pParent, WinBits nStyle ) { mnThumbPixOffset = 0; diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index 6ecc05d68671..d920737c3c01 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -169,7 +169,6 @@ void SpinButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, pDev->Pop(); } - void SpinButton::Paint( const Rectangle& ) { HideFocus(); diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 9091c1d93aa8..325e770e1060 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/rc.h" #include "vcl/event.hxx" @@ -29,8 +28,6 @@ #include "controldata.hxx" #include "svdata.hxx" - - namespace { void ImplGetSpinbuttonValue( Window *pWin, const Rectangle& rUpperRect, @@ -74,7 +71,6 @@ void ImplGetSpinbuttonValue( Window *pWin, const Rectangle& rUpperRect, rValue.mnLowerPart = bHorz ? PART_BUTTON_RIGHT : PART_BUTTON_DOWN; } - bool ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbuttonValue ) { bool bNativeOK = false; diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 3080f23edf24..1d736a7f3a7a 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/debug.hxx" #include "tools/rc.h" @@ -40,8 +39,6 @@ #include <boost/unordered_map.hpp> #include <vector> - - struct ImplTabItem { sal_uInt16 mnId; @@ -63,7 +60,6 @@ struct ImplTabItem {} }; - struct ImplTabCtrlData { boost::unordered_map< int, int > maLayoutPageIdToLine; @@ -74,7 +70,6 @@ struct ImplTabCtrlData ListBox* mpListBox; }; - #define TAB_OFFSET 3 #define TAB_TABOFFSET_X 3 #define TAB_TABOFFSET_Y 3 @@ -137,7 +132,6 @@ const Font& TabControl::GetCanonicalFont( const StyleSettings& _rStyle ) const return _rStyle.GetAppFont(); } - const Color& TabControl::GetCanonicalTextColor( const StyleSettings& _rStyle ) const { return _rStyle.GetButtonTextColor(); diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx index 05375c091c42..c9b3b77a0be5 100644 --- a/vcl/source/edit/textdat2.hxx +++ b/vcl/source/edit/textdat2.hxx @@ -77,8 +77,6 @@ public: bool HasValidSize() const { return nWidth != (-1); } }; - - typedef std::vector<TETextPortion*> TextPortionArray; class TETextPortionList : public TextPortionArray @@ -186,8 +184,6 @@ inline bool TextLine::operator != ( const TextLine& rLine ) const return !( *this == rLine ); } - - class TEParaPortion { private: @@ -197,21 +193,18 @@ private: TETextPortionList maTextPortions; std::vector<TEWritingDirectionInfo> maWritingDirectionInfos; - sal_uInt16 mnInvalidPosStart; short mnInvalidDiff; bool mbInvalid; bool mbSimple; // nur lineares Tippen - TEParaPortion( const TEParaPortion& ) {;} public: TEParaPortion( TextNode* pNode ); ~TEParaPortion(); - bool IsInvalid() const { return mbInvalid; } bool IsSimpleInvalid() const { return mbSimple; } void SetNotSimpleInvalid() { mbSimple = false; } @@ -228,12 +221,10 @@ public: TETextPortionList& GetTextPortions() { return maTextPortions; } std::vector<TEWritingDirectionInfo>& GetWritingDirectionInfos() { return maWritingDirectionInfos; } - sal_uInt16 GetLineNumber( sal_uInt16 nIndex, bool bInclEnd ); void CorrectValuesBehindLastFormattedLine( sal_uInt16 nLastFormattedLine ); }; - class TEParaPortions : public ToolsList<TEParaPortion*> { public: @@ -242,7 +233,6 @@ public: void Reset(); }; - class TextSelFunctionSet: public FunctionSet { private: @@ -264,7 +254,6 @@ public: virtual void DestroyAnchor() SAL_OVERRIDE; }; - class IdleFormatter : public Timer { private: diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx index 892ffc1f4dba..f375525e7d4a 100644 --- a/vcl/source/edit/textdata.cxx +++ b/vcl/source/edit/textdata.cxx @@ -17,13 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/textdata.hxx> #include <textdat2.hxx> #include <tools/debug.hxx> - TextSelection::TextSelection() { } @@ -48,7 +46,6 @@ void TextSelection::Justify() } } - TETextPortionList::TETextPortionList() { } @@ -95,7 +92,6 @@ sal_uInt16 TETextPortionList::FindPortion( sal_uInt16 nCharPos, sal_uInt16& nPor return ( size() - 1 ); } - TEParaPortion::TEParaPortion( TextNode* pN ) { mpNode = pN; @@ -181,7 +177,6 @@ sal_uInt16 TEParaPortion::GetLineNumber( sal_uInt16 nChar, bool bInclEnd ) return ( maLines.size() - 1 ); } - void TEParaPortion::CorrectValuesBehindLastFormattedLine( sal_uInt16 nLastFormattedLine ) { sal_uInt16 nLines = maLines.size(); @@ -315,5 +310,4 @@ void TEIMEInfos::DestroyAttribs() nLen = 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx index 698e521c32b5..e96dacde26fb 100644 --- a/vcl/source/edit/textdoc.cxx +++ b/vcl/source/edit/textdoc.cxx @@ -63,7 +63,6 @@ void TextCharAttribList::Clear( bool bDestroyAttribs ) TextCharAttribs::clear(); } - void TextCharAttribList::InsertAttrib( TextCharAttrib* pAttrib ) { if ( pAttrib->IsEmpty() ) @@ -485,7 +484,6 @@ OUString TextDoc::GetText( sal_uLong nPara ) const return aText; } - sal_uLong TextDoc::GetTextLen( const sal_Unicode* pSep, const TextSelection* pSel ) const { sal_uLong nLen = 0; diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx index 06623ce218dd..1f42c3a0f7c8 100644 --- a/vcl/source/edit/textdoc.hxx +++ b/vcl/source/edit/textdoc.hxx @@ -66,7 +66,6 @@ public: bool HasBoundingAttrib( sal_uInt16 nBound ); }; - class TextNode { private: @@ -81,7 +80,6 @@ protected: public: TextNode( const OUString& rText ); - const OUString& GetText() const { return maText; } const TextCharAttribList& GetCharAttribs() const { return maCharAttribs; } diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 74fb8bcf045a..c19f5df28648 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -63,7 +63,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::rtl; - TextEngine::TextEngine() { mpDoc = 0; @@ -479,7 +478,6 @@ void TextEngine::SetText( const OUString& rText ) DBG_ASSERT( !HasUndoManager() || !GetUndoManager().GetUndoActionCount(), "SetText: Undo!" ); } - void TextEngine::CursorMoved( sal_uLong nNode ) { // delete empty attribute; but only if paragraph is not empty! @@ -749,7 +747,6 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel, // at this point now we will insert the character 'normally' some lines below... } - if ( IsUndoEnabled() && !IsInUndo() ) { TextUndoInsertChars* pNewUndo = new TextUndoInsertChars( this, aPaM, OUString(c) ); @@ -772,7 +769,6 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel, return aPaM; } - TextPaM TextEngine::ImpInsertText( const TextSelection& rCurSel, const OUString& rStr ) { UndoActionStart(); @@ -1153,7 +1149,6 @@ sal_uInt16 TextEngine::GetCharPos( sal_uLong nPortion, sal_uInt16 nLine, long nX return nCurIndex; } - sal_uLong TextEngine::GetTextHeight() const { DBG_ASSERT( GetUpdateMode(), "GetTextHeight: GetUpdateMode()" ); @@ -1479,7 +1474,6 @@ void TextEngine::FormatAndUpdate( TextView* pCurView ) } } - void TextEngine::IdleFormatAndUpdate( TextView* pCurView, sal_uInt16 nMaxTimerRestarts ) { mpIdleFormatter->DoIdleFormat( pCurView, nMaxTimerRestarts ); @@ -2746,7 +2740,6 @@ void TextEngine::SetTextAlign( TxtAlign eAlign ) } } - void TextEngine::ValidateSelection( TextSelection& rSel ) const { ValidatePaM( rSel.GetStart() ); @@ -2767,7 +2760,6 @@ void TextEngine::ValidatePaM( TextPaM& rPaM ) const rPaM.GetIndex() = nMaxIndex; } - // adjust State & Selection void TextEngine::ImpParagraphInserted( sal_uLong nPara ) @@ -2951,7 +2943,6 @@ void TextEngine::ImpInitWritingDirections( sal_uLong nPara ) const UBiDiLevel nBidiLevel = IsRightToLeft() ? 1 /*RTL*/ : 0 /*LTR*/; OUString aText( pParaPortion->GetNode()->GetText() ); - // Bidi functions from icu 2.0 UErrorCode nError = U_ZERO_ERROR; diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx index 8a5a917dd3a4..b469a3bad618 100644 --- a/vcl/source/edit/textund2.hxx +++ b/vcl/source/edit/textund2.hxx @@ -22,7 +22,6 @@ #include "textundo.hxx" #include <vcl/textdata.hxx> - class TextUndoDelPara : public TextUndo { private: @@ -41,7 +40,6 @@ public: virtual OUString GetComment () const SAL_OVERRIDE; }; - class TextUndoConnectParas : public TextUndo { private: @@ -59,7 +57,6 @@ public: virtual OUString GetComment () const SAL_OVERRIDE; }; - class TextUndoSplitPara : public TextUndo { private: @@ -77,7 +74,6 @@ public: virtual OUString GetComment () const SAL_OVERRIDE; }; - class TextUndoInsertChars : public TextUndo { private: @@ -96,7 +92,6 @@ public: virtual OUString GetComment () const SAL_OVERRIDE; }; - class TextUndoRemoveChars : public TextUndo { private: @@ -113,7 +108,6 @@ public: virtual OUString GetComment () const SAL_OVERRIDE; }; - class TextUndoSetAttribs: public TextUndo { private: diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx index 6cd4f339d642..59781e1d585d 100644 --- a/vcl/source/edit/textundo.cxx +++ b/vcl/source/edit/textundo.cxx @@ -36,7 +36,6 @@ TYPEINIT1( TextUndoSplitPara, TextUndo ); TYPEINIT1( TextUndoInsertChars, TextUndo ); TYPEINIT1( TextUndoRemoveChars, TextUndo ); - namespace { @@ -65,7 +64,6 @@ void Shorten (OUString& rString) } // namespace - TextUndoManager::TextUndoManager( TextEngine* p ) { mpTextEngine = p; @@ -96,7 +94,6 @@ bool TextUndoManager::Redo() if ( GetRedoActionCount() == 0 ) return false; - UndoRedoStart(); mpTextEngine->SetIsInUndo( true ); diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index 6c4f039397ab..c3593f8e8d9e 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -51,12 +51,10 @@ #include <vcl/edit.hxx> - #include <sot/exchange.hxx> #include <osl/mutex.hxx> - using namespace ::com::sun::star; class TETextDataObject : public ::com::sun::star::datatransfer::XTransferable, @@ -908,7 +906,6 @@ void TextView::MouseButtonDown( const MouseEvent& rMouseEvent ) } } - void TextView::MouseMove( const MouseEvent& rMouseEvent ) { mpImpl->mnTravelXPos = TRAVEL_X_DONTKNOW; @@ -1412,7 +1409,6 @@ TextPaM TextView::CursorRight( const TextPaM& rPaM, sal_uInt16 nCharacterIterato return aPaM; } - TextPaM TextView::CursorWordLeft( const TextPaM& rPaM ) { TextPaM aPaM( rPaM ); @@ -1435,7 +1431,6 @@ TextPaM TextView::CursorWordLeft( const TextPaM& rPaM ) return aPaM; } - TextPaM TextView::CursorWordRight( const TextPaM& rPaM ) { TextPaM aPaM( rPaM ); @@ -1522,8 +1517,6 @@ TextPaM TextView::ImpDelete( sal_uInt8 nMode, sal_uInt8 nDelMode ) return mpImpl->mpTextEngine->ImpDeleteText( TextSelection( aStartPaM, aEndPaM ) ); } - - TextPaM TextView::CursorUp( const TextPaM& rPaM ) { TextPaM aPaM( rPaM ); @@ -1705,7 +1698,6 @@ void TextView::ImpShowCursor( bool bGotoCursor, bool bForceVisCursor, bool bSpec if ( !mpImpl->mpTextEngine->IsFormatted() ) mpImpl->mpTextEngine->FormatAndUpdate( this ); - TextPaM aPaM( mpImpl->maSelection.GetEnd() ); Rectangle aEditCursor = mpImpl->mpTextEngine->PaMtoEditCursor( aPaM, bSpecial ); @@ -2003,7 +1995,6 @@ void TextView::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd: if ( mpImpl->mpTextEngine->HasAttrib( TEXTATTR_HYPERLINK ) ) // then also as HTML mpImpl->mpTextEngine->Write( pDataObj->GetHTMLStream(), &mpImpl->maSelection, true ); - /* // D&D of a Hyperlink // TODO: Better would be to store MBDownPaM in MBDown, @@ -2270,8 +2261,6 @@ sal_Int32 TextView::GetLineNumberOfCursorInSelection() const return nLineNo; } - - // (+) class TextSelFunctionSet TextSelFunctionSet::TextSelFunctionSet( TextView* pView ) diff --git a/vcl/source/edit/txtattr.cxx b/vcl/source/edit/txtattr.cxx index a9fe2df06957..c7d0c592a44d 100644 --- a/vcl/source/edit/txtattr.cxx +++ b/vcl/source/edit/txtattr.cxx @@ -17,13 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/txtattr.hxx> #include <vcl/font.hxx> - - - TextAttrib::~TextAttrib() { } @@ -33,7 +29,6 @@ bool TextAttrib::operator==( const TextAttrib& rAttr ) const return mnWhich == rAttr.mnWhich; } - TextAttribFontColor::TextAttribFontColor( const Color& rColor ) : TextAttrib( TEXTATTR_FONTCOLOR ), maColor( rColor ) { @@ -94,7 +89,6 @@ bool TextAttribFontWeight::operator==( const TextAttrib& rAttr ) const ( meWeight == ((const TextAttribFontWeight&)rAttr).meWeight ) ); } - TextAttribHyperLink::TextAttribHyperLink( const TextAttribHyperLink& rAttr ) : TextAttrib( rAttr ), maURL( rAttr.maURL ), maDescription( rAttr.maDescription ) { diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 117082c1b6fd..4e1deac8a0bb 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -34,7 +34,6 @@ #include <vcl/settings.hxx> #include <boost/scoped_ptr.hpp> - class TextWindow : public Window { private: @@ -79,7 +78,6 @@ public: void SetTextSelectable( bool bTextSelectable ) { mbTextSelectable = bTextSelectable; } }; - class ImpVclMEdit : public SfxListener { private: @@ -712,7 +710,6 @@ bool ImpVclMEdit::HandleCommand( const CommandEvent& rCEvt ) return bDone; } - TextWindow::TextWindow( Window* pParent ) : Window( pParent ) { mbInMBDown = false; @@ -1001,7 +998,6 @@ WinBits VclMultiLineEdit::ImplInitStyle( WinBits nStyle ) return nStyle; } - void VclMultiLineEdit::ImplInitSettings( bool /*bFont*/, bool /*bForeground*/, bool bBackground ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -1522,7 +1518,6 @@ bool VclMultiLineEdit::PreNotify( NotifyEvent& rNEvt ) return nDone || Edit::PreNotify( rNEvt ); } - // Internals for derived classes, e.g. TextComponent ExtTextEngine* VclMultiLineEdit::GetTextEngine() const diff --git a/vcl/source/edit/xtextedt.cxx b/vcl/source/edit/xtextedt.cxx index 04555e68acf5..6f63ccecb9a0 100644 --- a/vcl/source/edit/xtextedt.cxx +++ b/vcl/source/edit/xtextedt.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/xtextedt.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> @@ -27,7 +26,6 @@ using namespace ::com::sun::star; - ExtTextEngine::ExtTextEngine() : maGroupChars(OUString("(){}[]")) { } @@ -222,8 +220,6 @@ bool ExtTextEngine::Search( TextSelection& rSel, const util::SearchOptions& rSea return bFound; } - - // class ExtTextView ExtTextView::ExtTextView( ExtTextEngine* pEng, Window* pWindow ) diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx index 9d45c268cf94..7f4ed6d42e1c 100644 --- a/vcl/source/filter/FilterConfigCache.cxx +++ b/vcl/source/filter/FilterConfigCache.cxx @@ -440,8 +440,6 @@ bool FilterConfigCache::IsImportPixelFormat( sal_uInt16 nFormat ) return (nFormat < aImport.size()) && aImport[ nFormat ].bIsPixelFormat; } - - OUString FilterConfigCache::GetExportFilterName( sal_uInt16 nFormat ) { if( nFormat < aExport.size() ) diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx index 88afc3fa0c20..7a2e823f16b9 100644 --- a/vcl/source/filter/FilterConfigItem.cxx +++ b/vcl/source/filter/FilterConfigItem.cxx @@ -229,7 +229,6 @@ bool FilterConfigItem::ImplGetPropertyValue( Any& rAny, const Reference< XProper return bRetValue; } - // if property is available it returns a pointer, // otherwise the result is null PropertyValue* FilterConfigItem::GetPropertyValue( Sequence< PropertyValue >& rPropSeq, const OUString& rName ) @@ -400,15 +399,11 @@ void FilterConfigItem::WriteInt32( const OUString& rKey, sal_Int32 nNewValue ) } } - - Sequence< PropertyValue > FilterConfigItem::GetFilterData() const { return aFilterData; } - - Reference< XStatusIndicator > FilterConfigItem::GetStatusIndicator() const { Reference< XStatusIndicator > xStatusIndicator; diff --git a/vcl/source/filter/GraphicNativeTransform.cxx b/vcl/source/filter/GraphicNativeTransform.cxx index 9661d4a67f97..664749790d38 100644 --- a/vcl/source/filter/GraphicNativeTransform.cxx +++ b/vcl/source/filter/GraphicNativeTransform.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/XPropertySet.hpp> - #include "jpeg/Exif.hxx" #include "jpeg/JpegTransform.hxx" @@ -189,5 +188,4 @@ bool GraphicNativeTransform::rotateJPEG(sal_uInt16 aRotation) return true; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 48b88baf99c1..d0e639a012c9 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -181,7 +181,6 @@ sal_uInt8* ImplSearchEntry( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nCom return NULL; } - inline OUString ImpGetExtension( const OUString &rPath ) { OUString aExt; @@ -227,7 +226,6 @@ bool isPCT(SvStream& rStream, sal_uLong nStreamPos, sal_uLong nStreamLen) return false; } - /************************************************************************* * * ImpPeekGraphicFormat() @@ -774,8 +772,6 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, return bTest && !bSomethingTested; } - - sal_uInt16 GraphicFilter::ImpTestOrFindFormat( const OUString& rPath, SvStream& rStream, sal_uInt16& rFormat ) { // determine or check the filter/format by reading into it @@ -820,8 +816,6 @@ sal_uInt16 GraphicFilter::ImpTestOrFindFormat( const OUString& rPath, SvStream& return GRFILTER_OK; } - - #ifndef DISABLE_EXPORT static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& rConfigItem ) @@ -844,7 +838,6 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r nMode = 2; } - Size aOriginalSize; Size aPrefSize( rGraphic.GetPrefSize() ); MapMode aPrefMapMode( rGraphic.GetPrefMapMode() ); @@ -1331,8 +1324,6 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat return ImportGraphic( rGraphic, rPath, rIStream, nFormat, pDeterminedFormat, nImportFlags, NULL, pExtHeader ); } - - sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath, SvStream& rIStream, sal_uInt16 nFormat, sal_uInt16* pDeterminedFormat, sal_uInt32 nImportFlags, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData, @@ -1867,7 +1858,6 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString INetURLObject aURL( rPath ); OUString aExt( aURL.GetFileExtension().toAsciiUpperCase() ); - for( sal_uInt16 i = 0; i < nFormatCount; i++ ) { if ( pConfig->GetExportFormatExtension( i ).equalsIgnoreAsciiCase( aExt ) ) @@ -1950,7 +1940,6 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString // save RLE encoded? WriteDIB(aBmp, rOStm, bRleCoding, true); - if( rOStm.GetError() ) nStatus = GRFILTER_IOERROR; } diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx index 812c2430fdf7..77da7eb4191b 100644 --- a/vcl/source/filter/graphicfilter2.cxx +++ b/vcl/source/filter/graphicfilter2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string.h> #include <stdio.h> #include <tools/stream.hxx> @@ -457,7 +456,6 @@ bool GraphicDescriptor::ImpDetectPCX( SvStream& rStm, bool bExtendedInfo ) sal_uInt16 nDPIx; sal_uInt16 nDPIy; - rStm.SeekRel( 1 ); // compression diff --git a/vcl/source/filter/igif/decode.cxx b/vcl/source/filter/igif/decode.cxx index 561bf5c4480a..f53c00572f13 100644 --- a/vcl/source/filter/igif/decode.cxx +++ b/vcl/source/filter/igif/decode.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "decode.hxx" struct GIFLZWTableEntry diff --git a/vcl/source/filter/igif/decode.hxx b/vcl/source/filter/igif/decode.hxx index 3e1a783eaf0d..542532673359 100644 --- a/vcl/source/filter/igif/decode.hxx +++ b/vcl/source/filter/igif/decode.hxx @@ -46,7 +46,6 @@ class GIFLZWDecompressor void AddToTable(sal_uInt16 nPrevCode, sal_uInt16 nCodeFirstData); bool ProcessOneCode(); - public: GIFLZWDecompressor( sal_uInt8 cDataSize ); diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx index b3168a0194c6..a26a57af8f39 100644 --- a/vcl/source/filter/igif/gifread.cxx +++ b/vcl/source/filter/igif/gifread.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #define _GIFPRIVATE #include "decode.hxx" @@ -51,7 +50,6 @@ GIFReader::GIFReader( SvStream& rStm ) : ClearImageExtensions(); } - GIFReader::~GIFReader() { aImGraphic.SetContext( NULL ); @@ -635,7 +633,6 @@ bool GIFReader::ProcessGIF() } break; - // read extension case( EXTENSION_READING ): { @@ -644,7 +641,6 @@ bool GIFReader::ProcessGIF() } break; - // read Image-Descriptor case( LOCAL_HEADER_READING ): { @@ -656,7 +652,6 @@ bool GIFReader::ProcessGIF() } break; - // read first data block case( FIRST_BLOCK_READING ): { diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx index 89f0d06bfcd4..b2910844843c 100644 --- a/vcl/source/filter/ixbm/xbmread.cxx +++ b/vcl/source/filter/ixbm/xbmread.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #define _XBMPRIVATE #include <ctype.h> #include <comphelper/string.hxx> diff --git a/vcl/source/filter/ixbm/xbmread.hxx b/vcl/source/filter/ixbm/xbmread.hxx index dc62ff446045..4f3b52e7e8af 100644 --- a/vcl/source/filter/ixbm/xbmread.hxx +++ b/vcl/source/filter/ixbm/xbmread.hxx @@ -57,7 +57,6 @@ class XBMReader : public GraphicReader long ParseDefine( const sal_Char* pDefine ); bool ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat eFormat ); - public: XBMReader( SvStream& rStm ); diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx index 5ed2f7425561..e3f48ecbf05b 100644 --- a/vcl/source/filter/ixpm/xpmread.cxx +++ b/vcl/source/filter/ixpm/xpmread.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/bmpacc.hxx> #include <vcl/graph.hxx> #include "rgbtable.hxx" @@ -51,8 +50,6 @@ XPMReader::~XPMReader() maBmp.ReleaseAccess( mpAcc ); } - - ReadState XPMReader::ReadXPM( Graphic& rGraphic ) { ReadState eReadState; @@ -208,7 +205,6 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic ) return eReadState; } - // ImplGetColor returns variouls colour values, // returns TRUE if various colours could be assigned @@ -227,7 +223,6 @@ bool XPMReader::ImplGetColor( sal_uLong nNumb ) return bStatus; } - // ImpGetScanLine reads the string mpBufSize and writes the pixel in the // Bitmap. Parameter nY is the horizontal position. @@ -293,7 +288,6 @@ bool XPMReader::ImplGetScanLine( sal_uLong nY ) return bStatus; } - // tries to determine a colour value from mpStringBuf // if a colour was found the RGB value is written a pDest[1]..pDest[2] // pDest[0] contains 0xFF if the colour is transparent otherwise 0 @@ -361,7 +355,6 @@ bool XPMReader::ImplGetColSub( sal_uInt8* pDest ) return bColStatus; } - // ImplGetColKey searches string mpStringBuf for a parameter 'nKey' // and returns a boolean. (if TRUE mpPara and mnParaSize will be set) @@ -405,7 +398,6 @@ bool XPMReader::ImplGetColKey( sal_uInt8 nKey ) return ( mnParaSize ) ? true : false; } - // ImplGetRGBHex translates the ASCII-Hexadecimalvalue belonging to mpPara // in a RGB value and writes this to pDest // below formats should be contained in mpPara: @@ -413,7 +405,6 @@ bool XPMReader::ImplGetColKey( sal_uInt8 nKey ) // 2 : '#1234abcd1234' " " " " // 6 : '#12345678abcdefab12345678' " " " " - void XPMReader::ImplGetRGBHex( sal_uInt8* pDest,sal_uLong nAdd ) { sal_uInt8* pPtr = mpPara+1; @@ -435,7 +426,6 @@ void XPMReader::ImplGetRGBHex( sal_uInt8* pDest,sal_uLong nAdd ) } } - // ImplGetUlong returns the value of a up to 6-digit long ASCII-decimal number. sal_uLong XPMReader::ImplGetULONG( sal_uLong nPara ) @@ -458,8 +448,6 @@ sal_uLong XPMReader::ImplGetULONG( sal_uLong nPara ) else return 0; } - - bool XPMReader::ImplCompare( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nSize, sal_uLong nMode ) { bool bRet = true; @@ -489,7 +477,6 @@ bool XPMReader::ImplCompare( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nSi return bRet; } - // ImplGetPara tries to retrieve nNumb (0...x) parameters from mpStringBuf. // Parameters are separated by spaces or tabs. // If a parameter was found then the return value is TRUE and mpPara + mnParaSize @@ -545,7 +532,6 @@ bool XPMReader::ImplGetPara ( sal_uLong nNumb ) return ( ( nCount == nNumb ) && ( mpPara ) ); } - // The next string is read and stored in mpStringBuf (terminated with 0); // mnStringSize contains the size of the string read. // Comments like '//' and '/*....*/' are skipped. @@ -644,10 +630,8 @@ bool XPMReader::ImplGetString( void ) return mbStatus; } - // - ImportXPM - - bool ImportXPM( SvStream& rStm, Graphic& rGraphic ) { XPMReader* pXPMReader = (XPMReader*) rGraphic.GetContext(); diff --git a/vcl/source/filter/ixpm/xpmread.hxx b/vcl/source/filter/ixpm/xpmread.hxx index d7ede08a225f..ad9911a06c44 100644 --- a/vcl/source/filter/ixpm/xpmread.hxx +++ b/vcl/source/filter/ixpm/xpmread.hxx @@ -35,7 +35,6 @@ #define XPMEXTENSIONS 0x00000006 #define XPMENDEXT 0x00000007 - #define XPMREMARK 0x00000001 // defines used by mnStatus #define XPMDOUBLE 0x00000002 #define XPMSTRING 0x00000004 diff --git a/vcl/source/filter/jpeg/Exif.hxx b/vcl/source/filter/jpeg/Exif.hxx index 4be2f94e1b1b..c365ec8071bf 100644 --- a/vcl/source/filter/jpeg/Exif.hxx +++ b/vcl/source/filter/jpeg/Exif.hxx @@ -87,7 +87,6 @@ public : }; - #endif // INCLUDED_VCL_SOURCE_FILTER_JPEG_EXIF_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/jpeg/JpegTransform.cxx b/vcl/source/filter/jpeg/JpegTransform.cxx index 722ddbdb0ac2..a71b816f3f50 100644 --- a/vcl/source/filter/jpeg/JpegTransform.cxx +++ b/vcl/source/filter/jpeg/JpegTransform.cxx @@ -43,5 +43,4 @@ void JpegTransform::setRotate(sal_uInt16 aRotate) maRotate = aRotate; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/jpeg/jinclude.h b/vcl/source/filter/jpeg/jinclude.h index 121fbecdf1ea..edd608deacf4 100644 --- a/vcl/source/filter/jpeg/jinclude.h +++ b/vcl/source/filter/jpeg/jinclude.h @@ -14,7 +14,6 @@ * JPEG library. Most applications need only include jpeglib.h. */ - /* Include auto-config file to find out which system include files we need. */ #include "jconfig.h" /* auto configuration options */ diff --git a/vcl/source/filter/jpeg/transupp.h b/vcl/source/filter/jpeg/transupp.h index 69bf46f876af..4448c9fa8272 100644 --- a/vcl/source/filter/jpeg/transupp.h +++ b/vcl/source/filter/jpeg/transupp.h @@ -76,7 +76,6 @@ * be aware of the option to know how many components to work on. */ - /* Short forms of external names for systems with brain-damaged linkers. */ #ifdef NEED_SHORT_EXTERNAL_NAMES @@ -89,7 +88,6 @@ #define jcopy_markers_execute jCMrkExec #endif /* NEED_SHORT_EXTERNAL_NAMES */ - /* * Codes for supported types of image transformations. */ @@ -162,7 +160,6 @@ typedef struct { int iMCU_sample_height; } jpeg_transform_info; - #if TRANSFORMS_SUPPORTED /* Parse a crop specification (written in X11 geometry style) */ @@ -198,7 +195,6 @@ EXTERN(boolean) jtransform_perfect_transform #endif /* TRANSFORMS_SUPPORTED */ - /* * Support for copying optional markers from source to destination file. */ diff --git a/vcl/source/filter/sgfbram.cxx b/vcl/source/filter/sgfbram.cxx index 1c691014275c..733b9c01b47a 100644 --- a/vcl/source/filter/sgfbram.cxx +++ b/vcl/source/filter/sgfbram.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string.h> #include <osl/endian.h> #include <tools/stream.hxx> @@ -454,7 +453,6 @@ bool SgfFilterVect(SvStream& rInp, SgfHeader& rHead, SgfEntry&, GDIMetaFile& rMt return true; } - bool SgfVectFilter(SvStream& rInp, GDIMetaFile& rMtf) { sal_uLong nFileStart; // offset of SgfHeaders. Usually 0. diff --git a/vcl/source/filter/sgfbram.hxx b/vcl/source/filter/sgfbram.hxx index 72f4cec81a7a..501b2f26b635 100644 --- a/vcl/source/filter/sgfbram.hxx +++ b/vcl/source/filter/sgfbram.hxx @@ -37,7 +37,6 @@ #define SgfVectGray 5 /* use greyscale for lines only for */ #define SgfVectWdth 6 /* use line widths for lines SimpVector */ - #define SgfHeaderSize 42 class SgfHeader { diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx index d2c42cc6131a..a2e7c14122c6 100644 --- a/vcl/source/filter/sgvmain.cxx +++ b/vcl/source/filter/sgvmain.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <rtl/math.hxx> #include <osl/endian.h> #include <vcl/graph.hxx> @@ -599,7 +598,6 @@ void DrawSlideCirc(sal_Int16 cx, sal_Int16 cy, sal_Int16 rx, sal_Int16 ry, ObjAr } } - void CircType::Draw(OutputDevice& rOut) { Rectangle aRect(Center.x-Radius.x,Center.y-Radius.y,Center.x+Radius.x,Center.y+Radius.y); @@ -696,7 +694,6 @@ void BmapType::Draw(OutputDevice& rOut) } } - sal_uInt32 GrupType::GetSubPtr() { return sal_uInt32(SbLo)+0x00010000*sal_uInt32(SbHi); diff --git a/vcl/source/filter/sgvspln.cxx b/vcl/source/filter/sgvspln.cxx index b95fc50c8f44..f68652843759 100644 --- a/vcl/source/filter/sgvspln.cxx +++ b/vcl/source/filter/sgvspln.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <math.h> - #include <tools/poly.hxx> #include <boost/scoped_array.hpp> @@ -32,7 +30,6 @@ extern "C" { /*.fe The include file u_const.h should be stored in the directory, */ /*.fe where the compiler searches for include files. */ - /*----------------------- FILE u_const.h ---------------------------*/ #define IEEE @@ -98,7 +95,6 @@ short basis() /* calculate BASE machine independence */ #define MAXEXPON 1023.0 /* largest exponent */ #define MINEXPON -1024.0 /* smallest exponent */ - #define MACH_EPS masch() #define POSMAX pow ((double) BASIS, MAXEXPON) @@ -114,16 +110,11 @@ short basis() /* calculate BASE machine independence */ /*-------------------- END of FILE u_const.h -----------------------*/ - - - - /*.HL appendix: C - programs*/ /*.HR Systems of equations for tridiagonal matrices*/ /*.FE P 3.7 tridiagonal systems of equations */ - /*---------------------- MODULE tridiagonal -----------------------*/ sal_uInt16 TriDiagGS(bool rep, sal_uInt16 n, double* lower, @@ -243,23 +234,13 @@ sal_uInt16 TriDiagGS(bool rep, sal_uInt16 n, double* lower, /*----------------------- END OF TRIDIAGONAL ------------------------*/ - - - - - - - - /*.HL Appendix: C - Programs*/ /*.HRSystems of equations with cyclic tridiagonal matrices*/ /*.FE P 3.8 Systems with cyclic tridiagonal matrices */ - /*---------------- Module cyclic tridiagonal -----------------------*/ - sal_uInt16 ZyklTriDiagGS(bool rep, sal_uInt16 n, double* lower, double* diag, double* upper, double* lowrow, double* ricol, double* b) /******************************/ @@ -400,10 +381,8 @@ sal_uInt16 ZyklTriDiagGS(bool rep, sal_uInt16 n, double* lower, double* diag, /*------------------ END of CYCLIC TRIDIAGONAL ---------------------*/ - } // extern "C" - /************************************************************************* |* |* NaturalSpline() @@ -507,7 +486,6 @@ sal_uInt16 NaturalSpline(sal_uInt16 n, double* x, double* y, return 0; } - /************************************************************************* |* |* PeriodicSpline() @@ -517,7 +495,6 @@ sal_uInt16 NaturalSpline(sal_uInt16 n, double* x, double* y, |* *************************************************************************/ - sal_uInt16 PeriodicSpline(sal_uInt16 n, double* x, double* y, double* b, double* c, double* d) { // array dimensions should range from [0..n]! @@ -576,8 +553,6 @@ sal_uInt16 PeriodicSpline(sal_uInt16 n, double* x, double* y, return 0; } - - /************************************************************************* |* |* ParaSpline() @@ -652,8 +627,6 @@ sal_uInt16 ParaSpline(sal_uInt16 n, double* x, double* y, sal_uInt8 MargCond, return 0; } - - /************************************************************************* |* |* CalcSpline() @@ -737,7 +710,6 @@ bool CalcSpline(Polygon& rPoly, bool Periodic, sal_uInt16& n, return bRet; } - /************************************************************************* |* |* Spline2Poly() diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx index e942e891bd19..bafcdfa4b442 100644 --- a/vcl/source/filter/sgvtext.cxx +++ b/vcl/source/filter/sgvtext.cxx @@ -36,7 +36,6 @@ extern SgfFontLst* pSgfFonts; #define abs(x) ((x)<0 ? -(x) : (x)) #endif - // Limitations: only grey shadows, 2D and with fixed distance. // Start of AbsBase.Pas @@ -124,7 +123,6 @@ extern SgfFontLst* pSgfFonts; #define MinChar 32 #define MaxChar 255 - #define CharTopToBase 100 /* due to quotes more as 75% */ #define CharTopToBtm 120 /* line height larger as text angle */ // for Avanti-Bold 'ue' actually even 130% @@ -207,7 +205,6 @@ sal_uInt16 GetTopToBaseLine(sal_uInt16 MaxGrad) // in spaces, including HardTrenner in minus signs. TextEnde is // always returned as Char(0). - UCHAR ConvertTextChar(UCHAR c) { if (c<32) { @@ -356,7 +353,6 @@ UCHAR ProcessOne(UCHAR* TBuf, sal_uInt16& Index, return c; } // end of ProcessOne - UCHAR GetTextChar(UCHAR* TBuf, sal_uInt16& Index, ObjTextType& Atr0, ObjTextType& AktAtr, sal_uInt16 Rest, bool ScanEsc) @@ -407,7 +403,6 @@ UCHAR GetTextCharConv(UCHAR* TBuf, sal_uInt16& Index, return c; } - // Function GetLineFeed() // // Required line spacing in SGF-Units. ChrVPos is taken into account. @@ -1012,7 +1007,6 @@ void ObjTextType::SetFont(sal_uInt32 FontID) FontHi=sal_uInt16((FontID & 0xFFFF0000)>>16); } - // SGF.Ini lesen SgfFontOne::SgfFontOne() { diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index ea0e32c5c32d..e518cddcb692 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -351,7 +351,6 @@ bool EMFWriter::WriteEMF( const GDIMetaFile& rMtf, FilterConfigItem* pFilterConf .WriteUInt32( (sal_uInt32)0x14 ); // nSizeLast ImplEndRecord(); - // write header const sal_uLong nEndPos = m_rStm.Tell(); m_rStm.Seek( nHeaderPos ); diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index 6c58c94644d0..7be3492ccfb7 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "winmtf.hxx" #include <osl/endian.h> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -154,7 +153,6 @@ using namespace std; #define EMR_SETLINKEDUFIS 119 #define EMR_SETTEXTJUSTIFICATION 120 - #ifdef OSL_BIGENDIAN // little endian <-> big endian switch static float GetSwapFloat( SvStream& rSt ) @@ -326,7 +324,6 @@ void EnhWMFReader::ReadAndDrawPolygon(Drawer drawer, const bool skipFirst) drawer(pOut, aPolygon, skipFirst, bRecordPath); } - /** * Reads polygons from the stream. * The \<class T> parameter is for the type of the points @@ -1488,7 +1485,6 @@ bool EnhWMFReader::ReadEnhWMF() return bStatus; }; - bool EnhWMFReader::ReadHeader() { sal_uInt32 nType, nSignature, nVersion; @@ -1595,7 +1591,6 @@ bool EnhWMFReader::ReadHeader() return true; } - Rectangle EnhWMFReader::ReadRectangle( sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 ) { Point aTL ( Point( x1, y1 ) ); diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index aca9822e685f..e7f6b200c55a 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -29,7 +29,6 @@ #include <rtl/tencinfo.h> #include <vcl/virdev.hxx> - #if OSL_DEBUG_LEVEL > 1 #define EMFP_DEBUG(x) x #else @@ -88,7 +87,6 @@ basegfx::B2DPolyPolygon WinMtfClipPath::getClipPath() const return maClip.getClipPoly(); } - void WinMtfPathObj::AddPoint( const Point& rPoint ) { if ( bClosed ) @@ -136,7 +134,6 @@ void WinMtfPathObj::ClosePath() bClosed = true; } - WinMtfFontStyle::WinMtfFontStyle( LOGFONTW& rFont ) { rtl_TextEncoding eCharSet; @@ -405,7 +402,6 @@ Point WinMtfOutput::ImplMap( const Point& rPt ) return Point(); }; - Size WinMtfOutput::ImplMap( const Size& rSz ) { if ( mnWinExtX && mnWinExtY ) @@ -465,13 +461,11 @@ Size WinMtfOutput::ImplMap( const Size& rSz ) return Size(); } - Rectangle WinMtfOutput::ImplMap( const Rectangle& rRect ) { return Rectangle( ImplMap( rRect.TopLeft() ), ImplMap( rRect.GetSize() ) ); } - void WinMtfOutput::ImplMap( Font& rFont ) { // !!! HACK: we now always set the width to zero because the OS width is interpreted differently; @@ -497,7 +491,6 @@ Polygon& WinMtfOutput::ImplMap( Polygon& rPolygon ) return rPolygon; } - Polygon& WinMtfOutput::ImplScale( Polygon& rPolygon ) { sal_uInt16 nPoints = rPolygon.GetSize(); @@ -508,7 +501,6 @@ Polygon& WinMtfOutput::ImplScale( Polygon& rPolygon ) return rPolygon; } - PolyPolygon& WinMtfOutput::ImplScale( PolyPolygon& rPolyPolygon ) { sal_uInt16 nPolys = rPolyPolygon.Count(); @@ -519,7 +511,6 @@ PolyPolygon& WinMtfOutput::ImplScale( PolyPolygon& rPolyPolygon ) return rPolyPolygon; } - PolyPolygon& WinMtfOutput::ImplMap( PolyPolygon& rPolyPolygon ) { sal_uInt16 nPolys = rPolyPolygon.Count(); @@ -527,7 +518,6 @@ PolyPolygon& WinMtfOutput::ImplMap( PolyPolygon& rPolyPolygon ) return rPolyPolygon; } - void WinMtfOutput::SelectObject( sal_Int32 nIndex ) { GDIObj* pGDIObj = NULL; @@ -619,43 +609,36 @@ void WinMtfOutput::SelectObject( sal_Int32 nIndex ) delete pGDIObj; } - const Font& WinMtfOutput::GetFont() const { return maFont; } - void WinMtfOutput::SetTextLayoutMode( const sal_uInt32 nTextLayoutMode ) { mnTextLayoutMode = nTextLayoutMode; } - void WinMtfOutput::SetBkMode( sal_uInt32 nMode ) { mnBkMode = nMode; } - void WinMtfOutput::SetBkColor( const Color& rColor ) { maBkColor = rColor; } - void WinMtfOutput::SetTextColor( const Color& rColor ) { maTextColor = rColor; } - void WinMtfOutput::SetTextAlign( sal_uInt32 nAlign ) { mnTextAlign = nAlign; } - void WinMtfOutput::ImplResizeObjectArry( sal_uInt32 nNewEntrys ) { sal_uInt32 i = vGDIObj.size(); @@ -664,7 +647,6 @@ void WinMtfOutput::ImplResizeObjectArry( sal_uInt32 nNewEntrys ) vGDIObj[ i ] = NULL; } - void WinMtfOutput::ImplDrawClippedPolyPolygon( const PolyPolygon& rPolyPoly ) { if ( rPolyPoly.Count() ) @@ -815,7 +797,6 @@ void WinMtfOutput::SetClipPath( const PolyPolygon& rPolyPolygon, sal_Int32 nClip } } - WinMtfOutput::WinMtfOutput( GDIMetaFile& rGDIMetaFile ) : mnLatestTextAlign ( 0 ), mnTextAlign ( TA_LEFT | TA_TOP | TA_NOUPDATECP ), diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index 73e78a5aa79c..62a9f2aaf3f4 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -71,7 +71,6 @@ #define DEFAULT_PALETTE 15 #define SYSTEM_FIXED_FONT 16 - #define R2_BLACK 1 #define R2_NOTMERGEPEN 2 #define R2_MASKNOTPEN 3 @@ -99,7 +98,6 @@ #define MM_ISOTROPIC 7 #define MM_ANISOTROPIC 8 - /* Graphics modes */ #define GM_COMPATIBLE 1 #define GM_ADVANCED 2 @@ -220,7 +218,6 @@ struct WMF_EXTERNALHEADER; /*_WIN32_WINNT >= 0x0500*/ #define ETO_PDY 0x2000 - #define DEFAULT_PITCH 0x00 #define FIXED_PITCH 0x01 #define VARIABLE_PITCH 0x02 @@ -394,7 +391,6 @@ struct WinMtfFillStyle } }; - struct WinMtfLineStyle { Color aLineColor; @@ -445,7 +441,6 @@ struct WinMtfLineStyle } }; - struct XForm { float eM11; @@ -461,7 +456,6 @@ struct XForm } }; - struct SaveStruct { sal_uInt32 nBkMode, nMapMode, nGfxMode, nTextLayoutMode; @@ -488,7 +482,6 @@ struct SaveStruct typedef ::boost::shared_ptr< SaveStruct > SaveStructPtr; - struct BSaveStruct { Bitmap aBmp; @@ -511,7 +504,6 @@ struct BSaveStruct typedef ::std::vector< BSaveStruct* > BSaveStructList_impl; - enum GDIObjectType { GDI_DUMMY = 0, GDI_PEN = 1, @@ -565,7 +557,6 @@ struct GDIObj } }; - class WinMtfOutput { WinMtfPathObj aPathObj; @@ -752,7 +743,6 @@ public: virtual ~WinMtfOutput(); }; - class WinMtf { protected: @@ -780,14 +770,12 @@ protected: ~WinMtf(); }; - class EnhWMFReader : public WinMtf { bool bRecordPath; sal_Int32 nRecordCount; bool bEMFPlus; - bool ReadHeader(); // reads and converts the rectangle Rectangle ReadRectangle( sal_Int32, sal_Int32, sal_Int32, sal_Int32 ); @@ -815,7 +803,6 @@ private: template <class T, class Drawer> void ReadAndDrawPolygon(Drawer drawer, const bool skipFirst); }; - class WMFReader : public WinMtf { private: diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index 792f48492cd9..fff2f9db0285 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "winmtf.hxx" #include <boost/scoped_array.hpp> #include <vcl/gdimtf.hxx> diff --git a/vcl/source/filter/wmf/wmf.cxx b/vcl/source/filter/wmf/wmf.cxx index 59e26b44a853..3efc5c9d51d8 100644 --- a/vcl/source/filter/wmf/wmf.cxx +++ b/vcl/source/filter/wmf/wmf.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "winmtf.hxx" #include "emfwr.hxx" #include "wmfwr.hxx" diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index 62bf6ec094c6..6439b41fc2d2 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -179,55 +179,47 @@ void WMFWriter::CountActionsAndBitmaps( const GDIMetaFile & rMTF ) } } - void WMFWriter::WritePointXY(const Point & rPoint) { Point aPt( pVirDev->LogicToLogic(rPoint,aSrcMapMode,aTargetMapMode) ); pWMF->WriteInt16( (short)aPt.X() ).WriteInt16( (short)aPt.Y() ); } - void WMFWriter::WritePointYX(const Point & rPoint) { Point aPt( pVirDev->LogicToLogic(rPoint,aSrcMapMode,aTargetMapMode) ); pWMF->WriteInt16( (short)aPt.Y() ).WriteInt16( (short)aPt.X() ); } - sal_Int32 WMFWriter::ScaleWidth( sal_Int32 nDX ) { Size aSz( pVirDev->LogicToLogic(Size(nDX,0),aSrcMapMode,aTargetMapMode) ); return aSz.Width(); } - void WMFWriter::WriteSize(const Size & rSize) { Size aSz( pVirDev->LogicToLogic(rSize,aSrcMapMode,aTargetMapMode) ); pWMF->WriteInt16( (short)aSz.Width() ).WriteInt16( (short)aSz.Height() ); } - void WMFWriter::WriteHeightWidth(const Size & rSize) { Size aSz( pVirDev->LogicToLogic(rSize,aSrcMapMode,aTargetMapMode) ); pWMF->WriteInt16( (short)aSz.Height() ).WriteInt16( (short)aSz.Width() ); } - void WMFWriter::WriteRectangle(const Rectangle & rRect) { WritePointYX(Point(rRect.Right()+1,rRect.Bottom()+1)); WritePointYX(rRect.TopLeft()); } - void WMFWriter::WriteColor(const Color & rColor) { pWMF->WriteUChar( (sal_uInt8) rColor.GetRed() ).WriteUChar( (sal_uInt8) rColor.GetGreen() ).WriteUChar( (sal_uInt8) rColor.GetBlue() ).WriteUChar( (sal_uInt8) 0 ); } - void WMFWriter::WriteRecordHeader(sal_uInt32 nSizeWords, sal_uInt16 nType) { nActRecordPos=pWMF->Tell(); @@ -235,7 +227,6 @@ void WMFWriter::WriteRecordHeader(sal_uInt32 nSizeWords, sal_uInt16 nType) pWMF->WriteUInt32( nSizeWords ).WriteUInt16( nType ); } - void WMFWriter::UpdateRecordHeader() { sal_uLong nPos; @@ -253,7 +244,6 @@ void WMFWriter::UpdateRecordHeader() pWMF->Seek(nPos); } - void WMFWriter::WMFRecord_Arc(const Rectangle & rRect, const Point & rStartPt, const Point & rEndPt) { WriteRecordHeader(0x0000000b,W_META_ARC); @@ -270,7 +260,6 @@ void WMFWriter::WMFRecord_Chord(const Rectangle & rRect, const Point & rStartPt, WriteRectangle(rRect); } - void WMFWriter::WMFRecord_CreateBrushIndirect(const Color& rColor) { WriteRecordHeader(0x00000007,W_META_CREATEBRUSHINDIRECT); @@ -388,7 +377,6 @@ void WMFWriter::WMFRecord_DeleteObject(sal_uInt16 nObjectHandle) pWMF->WriteUInt16( nObjectHandle ); } - void WMFWriter::WMFRecord_Ellipse(const Rectangle & rRect) { WriteRecordHeader(0x00000007,W_META_ELLIPSE); @@ -619,7 +607,6 @@ void WMFWriter::WMFRecord_PolyLine(const Polygon & rPoly) for (i=0; i<nSize; i++) WritePointXY(aSimplePoly.GetPoint(i)); } - void WMFWriter::WMFRecord_PolyPolygon(const PolyPolygon & rPolyPoly) { const Polygon * pPoly; @@ -647,21 +634,18 @@ void WMFWriter::WMFRecord_PolyPolygon(const PolyPolygon & rPolyPoly) UpdateRecordHeader(); } - void WMFWriter::WMFRecord_Rectangle(const Rectangle & rRect) { WriteRecordHeader( 0x00000007,W_META_RECTANGLE ); WriteRectangle( rRect ); } - void WMFWriter::WMFRecord_RestoreDC() { WriteRecordHeader(0x00000004,W_META_RESTOREDC); pWMF->WriteInt16( (short)-1 ); } - void WMFWriter::WMFRecord_RoundRect(const Rectangle & rRect, long nHorzRound, long nVertRound) { WriteRecordHeader(0x00000009,W_META_ROUNDRECT); @@ -669,20 +653,17 @@ void WMFWriter::WMFRecord_RoundRect(const Rectangle & rRect, long nHorzRound, lo WriteRectangle(rRect); } - void WMFWriter::WMFRecord_SaveDC() { WriteRecordHeader(0x00000003,W_META_SAVEDC); } - void WMFWriter::WMFRecord_SelectObject(sal_uInt16 nObjectHandle) { WriteRecordHeader(0x00000004,W_META_SELECTOBJECT); pWMF->WriteUInt16( nObjectHandle ); } - void WMFWriter::WMFRecord_SetBkMode(bool bTransparent) { WriteRecordHeader(0x00000004,W_META_SETBKMODE); @@ -744,7 +725,6 @@ void WMFWriter::WMFRecord_SetWindowExt(const Size & rSize) WriteHeightWidth(rSize); } - void WMFWriter::WMFRecord_SetWindowOrg(const Point & rPoint) { WriteRecordHeader(0x00000005,W_META_SETWINDOWORG); @@ -774,7 +754,6 @@ void WMFWriter::WMFRecord_StretchDIB( const Point & rPoint, const Size & rSize, // write bitmap WriteDIB(rBitmap, *pWMF, false, true); - // write the parameters: nPosEnd=pWMF->Tell(); pWMF->Seek(nPosAnf); @@ -825,14 +804,12 @@ void WMFWriter::WMFRecord_EndOfFile() WriteRecordHeader(0x00000003,0x0000); } - void WMFWriter::WMFRecord_IntersectClipRect( const Rectangle& rRect ) { WriteRecordHeader( 0x00000007, W_META_INTERSECTCLIPRECT ); WriteRectangle(rRect); } - sal_uInt16 WMFWriter::AllocHandle() { sal_uInt16 i; @@ -847,13 +824,11 @@ sal_uInt16 WMFWriter::AllocHandle() return 0xffff; } - void WMFWriter::FreeHandle(sal_uInt16 nObjectHandle) { if (nObjectHandle<MAXOBJECTHANDLES) bHandleAllocated[nObjectHandle]=false; } - void WMFWriter::CreateSelectDeletePen( const Color& rColor, const LineInfo& rLineInfo ) { sal_uInt16 nOldHandle; @@ -868,7 +843,6 @@ void WMFWriter::CreateSelectDeletePen( const Color& rColor, const LineInfo& rLin } } - void WMFWriter::CreateSelectDeleteFont(const Font & rFont) { sal_uInt16 nOldHandle; @@ -883,7 +857,6 @@ void WMFWriter::CreateSelectDeleteFont(const Font & rFont) } } - void WMFWriter::CreateSelectDeleteBrush(const Color& rColor) { sal_uInt16 nOldHandle; @@ -898,7 +871,6 @@ void WMFWriter::CreateSelectDeleteBrush(const Color& rColor) } } - void WMFWriter::SetLineAndFillAttr() { if ( eDstROP2 != eSrcRasterOp ) @@ -957,7 +929,6 @@ void WMFWriter::SetAllAttr() } } - void WMFWriter::HandleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx::B2DPolygon& rLinePolygon) { if(rLinePolygon.count()) @@ -1103,7 +1074,6 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) } break; - case META_CHORD_ACTION: { const MetaChordAction* pA = (const MetaChordAction*) pMA; @@ -1670,7 +1640,6 @@ void WMFWriter::WriteHeader( const GDIMetaFile &, bool bPlaceable ) .WriteUInt16( (sal_uInt16)0x0000 ); // reserved } - void WMFWriter::UpdateHeader() { sal_uLong nPos; @@ -1691,7 +1660,6 @@ void WMFWriter::UpdateHeader() pWMF->Seek(nPos); } - bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream, FilterConfigItem* pFConfigItem, bool bPlaceable ) { @@ -1816,7 +1784,6 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream, return bStatus; } - sal_uInt16 WMFWriter::CalcSaveTargetMapMode(MapMode& rMapMode, const Size& rPrefSize) { diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx index 5e82cafb14cf..e195065f01a4 100644 --- a/vcl/source/font/PhysicalFontCollection.cxx +++ b/vcl/source/font/PhysicalFontCollection.cxx @@ -102,7 +102,6 @@ static unsigned lcl_IsCJKFont( const OUString& rFontName ) return 0; } - PhysicalFontCollection::PhysicalFontCollection() : mbMatchData( false ) , mbMapNames( false ) diff --git a/vcl/source/font/PhysicalFontFace.cxx b/vcl/source/font/PhysicalFontFace.cxx index c454d3d09970..b79969b498fd 100644 --- a/vcl/source/font/PhysicalFontFace.cxx +++ b/vcl/source/font/PhysicalFontFace.cxx @@ -25,7 +25,6 @@ #include "PhysicalFontFace.hxx" - PhysicalFontFace::PhysicalFontFace( const ImplDevFontAttributes& rDFA, int nMagic ) : ImplDevFontAttributes( rDFA ) , mnWidth(0) diff --git a/vcl/source/font/PhysicalFontFamily.cxx b/vcl/source/font/PhysicalFontFamily.cxx index f0f33071b1b3..a98a60df1114 100644 --- a/vcl/source/font/PhysicalFontFamily.cxx +++ b/vcl/source/font/PhysicalFontFamily.cxx @@ -89,7 +89,6 @@ static unsigned lcl_IsCJKFont( const OUString& rFontName ) return 0; } - PhysicalFontFamily::PhysicalFontFamily( const OUString& rSearchName ) : mpFirst( NULL ), maSearchName( rSearchName ), @@ -294,5 +293,4 @@ void PhysicalFontFamily::UpdateCloneFontList( PhysicalFontCollection& rFontColle } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index 83f68152e798..8880095fb7cc 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <cstdio> #include <cstring> #include <assert.h> @@ -256,7 +255,6 @@ struct TYPE2OP }; }; - struct CffGlobal { explicit CffGlobal(); @@ -285,7 +283,6 @@ struct CffGlobal int mnFamilyNameSID; }; - struct CffLocal { explicit CffLocal(); @@ -317,7 +314,6 @@ struct CffLocal bool mbForceBold; }; - class SubsetterContext { public: @@ -327,12 +323,9 @@ public: GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& ) = 0; }; - - SubsetterContext::~SubsetterContext( void) {} - class CffSubsetterContext : public SubsetterContext , private CffGlobal @@ -439,8 +432,6 @@ private: ValType maCharWidth; }; - - CffSubsetterContext::CffSubsetterContext( const U8* pBasePtr, int nBaseLen) : mpBasePtr( pBasePtr) , mpBaseEnd( pBasePtr+nBaseLen) @@ -454,15 +445,11 @@ CffSubsetterContext::CffSubsetterContext( const U8* pBasePtr, int nBaseLen) mpCffLocal = &maCffLocal[0]; } - - CffSubsetterContext::~CffSubsetterContext( void) { // TODO: delete[] maCffLocal; } - - inline int CffSubsetterContext::popInt( void) { const ValType aVal = popVal(); @@ -471,8 +458,6 @@ inline int CffSubsetterContext::popInt( void) return nInt; } - - inline int CffSubsetterContext::peekInt( void) const { const ValType aVal = peekVal(); @@ -481,8 +466,6 @@ inline int CffSubsetterContext::peekInt( void) const return nInt; } - - inline int CffSubsetterContext::getInt( int nIndex) const { const ValType aVal = getVal( nIndex); @@ -491,8 +474,6 @@ inline int CffSubsetterContext::getInt( int nIndex) const return nInt; } - - inline void CffSubsetterContext::updateWidth( bool bUseFirstVal) { #if 1 // TODO: is this still needed? @@ -511,8 +492,6 @@ inline void CffSubsetterContext::updateWidth( bool bUseFirstVal) } } - - void CffSubsetterContext::addHints( bool bVerticalHints) { // the first charstring value may a charwidth instead of a charwidth @@ -1456,7 +1435,6 @@ void CffSubsetterContext::seekIndexEnd( int nIndexBase) assert( mpReadEnd <= mpBaseEnd); } - // initialize FONTDICT specific values CffLocal::CffLocal( void) : mnPrivDictBase( 0) diff --git a/vcl/source/fontsubset/fontsubset.cxx b/vcl/source/fontsubset/fontsubset.cxx index 0f11ef7d251d..3be409923c83 100644 --- a/vcl/source/fontsubset/fontsubset.cxx +++ b/vcl/source/fontsubset/fontsubset.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/debug.hxx> #include <fontsubset.hxx> diff --git a/vcl/source/fontsubset/gsub.cxx b/vcl/source/fontsubset/gsub.cxx index 3d5c5d146643..147cba7d735a 100644 --- a/vcl/source/fontsubset/gsub.cxx +++ b/vcl/source/fontsubset/gsub.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "sft.hxx" #include "gsub.h" @@ -36,7 +35,6 @@ typedef sal_uInt8 FT_Byte; typedef std::map<sal_uInt16,sal_uInt16> GlyphSubstitution; - inline sal_uInt32 NEXT_Long( const unsigned char* &p ) { sal_uInt32 nVal = (p[0]<<24) + (p[1]<<16) + (p[2]<<8) + p[3]; diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index d95715903086..438876e0adfd 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - /* * Sun Font Tools * @@ -208,7 +207,6 @@ _inline sal_uInt32 GetUInt32(const sal_uInt8 *ptr, size_t offset, int bigendian) sal_uInt32 t; assert(ptr != 0); - if (bigendian) { t = (ptr+offset)[0] << 24 | (ptr+offset)[1] << 16 | (ptr+offset)[2] << 8 | (ptr+offset)[3]; @@ -258,7 +256,6 @@ _inline F16Dot16 fixedMul(F16Dot16 a, F16Dot16 b) return sign ? -res : res; } - _inline F16Dot16 fixedDiv(F16Dot16 a, F16Dot16 b) { unsigned int f, r; @@ -375,8 +372,6 @@ static void HexFmtBlockWrite(HexFmt *_this, const void *ptr, sal_uInt32 size) } #endif - - /* Outline Extraction functions */ /* fills the aw and lsb entries of the TTGlyphMetrics structure from hmtx table -*/ @@ -812,7 +807,6 @@ static int BSplineToPSPath(ControlPoint *srcA, int srcCount, PSPathElement **pat continue; } - if (cp == EndContour) { cp = StartContour; ecflag = true; @@ -1148,7 +1142,6 @@ static sal_uInt16 GEbinsearch(sal_uInt16 *ar, sal_uInt16 length, sal_uInt16 toSe return (sal_uInt16)lastfound; } - static sal_uInt32 getGlyph4(const sal_uInt8 *cmap, sal_uInt32 c) { sal_uInt16 i; int ToReturn; @@ -1216,7 +1209,6 @@ static sal_uInt32 getGlyph12(const sal_uInt8 *pCmap, sal_uInt32 cChar) { return MISSING_GLYPH_INDEX; } - static void FindCmap(TrueTypeFont *ttf) { const sal_uInt8* table = getTable(ttf, O_cmap); @@ -1791,7 +1783,6 @@ int CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, const char *h41 = "(%s) cvn exch definefont pop\n"; - if (!((nGlyphs > 0) && (nGlyphs <= 256))) return SF_GLYPHNUM; if (!glyphArray) return SF_BADARG; if (!fname) fname = ttf->psname; @@ -1967,7 +1958,6 @@ int CreateTTFromTTGlyphs(TrueTypeFont *ttf, GetUInt16(p, 46, 1), GetInt16(p, 48, 1)); - /** glyf **/ glyf = TrueTypeTableNew_glyf(); @@ -2034,7 +2024,6 @@ int CreateTTFromTTGlyphs(TrueTypeFont *ttf, } #endif - #ifndef NO_TYPE42 static GlyphOffsets *GlyphOffsetsNew(sal_uInt8 *sfntP) { @@ -2235,7 +2224,6 @@ int CreateT42FromTTGlyphs(TrueTypeFont *ttf, } #endif - #ifndef NO_MAPPERS int MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphArray, bool bvertical) { diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx index 3dca37ce8f6e..fdc7d1518619 100644 --- a/vcl/source/fontsubset/ttcr.cxx +++ b/vcl/source/fontsubset/ttcr.cxx @@ -35,7 +35,6 @@ #include "list.h" #include "string.h" - namespace vcl { @@ -169,7 +168,6 @@ static int NameRecordCompareF(const void *l, const void *r) return 0; } - static sal_uInt32 CheckSum(sal_uInt32 *ptr, sal_uInt32 length) { sal_uInt32 sum = 0; @@ -259,7 +257,6 @@ int StreamToMemory(TrueTypeCreator *_this, sal_uInt8 **ptr, sal_uInt32 *length) n = listCount(_this->tables); numTables = (sal_uInt16) n; - TableEntry* te = (TableEntry*)scalloc(n, sizeof(TableEntry)); listToFirst(_this->tables); @@ -348,8 +345,6 @@ int StreamToFile(TrueTypeCreator *_this, const char* fname) return r; } - - /* * TrueTypeTable private methods */ @@ -358,8 +353,6 @@ int StreamToFile(TrueTypeCreator *_this, const char* fname) #define TABLESIZE_hhea 36 #define TABLESIZE_maxp 32 - - /* Table data points to * -------------------------------------------- * generic tdata_generic struct @@ -373,7 +366,6 @@ int StreamToFile(TrueTypeCreator *_this, const char* fname) * */ - #define CMAP_SUBTABLE_INIT 10 #define CMAP_SUBTABLE_INCR 10 #define CMAP_PAIR_INIT 500 @@ -413,7 +405,6 @@ typedef struct { void *ptr; /* format-specific pointer */ } tdata_post; - /* allocate memory for a TT table */ static sal_uInt8 *ttmalloc(sal_uInt32 nbytes) { @@ -568,7 +559,6 @@ static int GetRawData_generic(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 return TTCR_OK; } - static int GetRawData_head(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 *len, sal_uInt32 *tag) { *len = TABLESIZE_head; @@ -701,8 +691,6 @@ static sal_uInt8 *PackCmapType6(CmapSubTable *s, sal_uInt32 *length) return ptr; } - - /* XXX it only handles Format 0 encoding tables */ static sal_uInt8 *PackCmap(CmapSubTable *s, sal_uInt32 *length) { @@ -762,7 +750,6 @@ static int GetRawData_cmap(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 *le return TTCR_OK; } - static int GetRawData_name(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 *len, sal_uInt32 *tag) { list l; @@ -862,10 +849,6 @@ static int GetRawData_post(TrueTypeTable *_this, sal_uInt8 **ptr, sal_uInt32 *le return ret; } - - - - static struct { sal_uInt32 tag; int (*f)(TrueTypeTable *, sal_uInt8 **, sal_uInt32 *, sal_uInt32 *); @@ -881,7 +864,6 @@ static struct { {T_name, GetRawData_name}, {T_post, GetRawData_post} - }; /* @@ -934,7 +916,6 @@ TrueTypeTable *TrueTypeTableNew_head(sal_uInt32 fontRevision, TrueTypeTable* table = (TrueTypeTable*)smalloc(sizeof(TrueTypeTable)); sal_uInt8* ptr = (sal_uInt8*)ttmalloc(TABLESIZE_head); - PutUInt32(0x00010000, ptr, 0, 1); /* version */ PutUInt32(fontRevision, ptr, 4, 1); PutUInt32(0x5F0F3CF5, ptr, 12, 1); /* magic number */ @@ -1272,7 +1253,6 @@ sal_uInt32 glyfCount(const TrueTypeTable *table) return listCount((list) table->data); } - void nameAdd(TrueTypeTable *table, NameRecord *nr) { list l; @@ -1348,7 +1328,6 @@ static void ProcessTables(TrueTypeCreator *tt) glyfLen += gd->nbytes; /* XXX if (gd->nbytes & 1) glyfLen++; */ - assert(gd->newID == i); gid[i++] = gd->glyphID; /* gd->glyphID = i++; */ @@ -1524,7 +1503,6 @@ extern "C" free(_this); } - /** * Destructor for the TrueTypeTable object. */ @@ -1547,7 +1525,6 @@ extern "C" } } - #ifdef TEST_TTCR _inline sal_uInt32 mkTag(sal_uInt8 a, sal_uInt8 b, sal_uInt8 c, sal_uInt8 d) { return (a << 24) | (b << 16) | (c << 8) | d; @@ -1584,7 +1561,6 @@ int main(void) free(t6); free(t7); - StreamToFile(ttcr, "ttcrout.ttf"); TrueTypeCreatorDispose(ttcr); diff --git a/vcl/source/fontsubset/ttcr.hxx b/vcl/source/fontsubset/ttcr.hxx index bb94faae1081..e2ee3c4e0cec 100644 --- a/vcl/source/fontsubset/ttcr.hxx +++ b/vcl/source/fontsubset/ttcr.hxx @@ -79,7 +79,6 @@ namespace vcl */ void RemoveTable(TrueTypeCreator *_this, sal_uInt32 tag); - /** * Writes a TrueType font generated by the TrueTypeCreator to a segment of * memory that this method allocates. When it is not needed anymore the caller @@ -94,7 +93,6 @@ namespace vcl */ int StreamToFile(TrueTypeCreator *_this, const char* fname); - /** * This function converts the data of a TrueType table to a raw array of bytes. * It may allocates the memory for it and returns the size of the raw data in bytes. @@ -184,7 +182,6 @@ namespace vcl sal_Int16 underlineThickness, sal_uInt32 isFixedPitch); - // Table manipulation functions /** @@ -217,7 +214,6 @@ namespace vcl } // namespace - extern "C" { /** diff --git a/vcl/source/fontsubset/xlat.hxx b/vcl/source/fontsubset/xlat.hxx index 2eb67832aeb5..62317c0d925b 100644 --- a/vcl/source/fontsubset/xlat.hxx +++ b/vcl/source/fontsubset/xlat.hxx @@ -19,7 +19,6 @@ /*| Author: Alexander Gelfenbain |*/ - #ifndef INCLUDED_VCL_SOURCE_FONTSUBSET_XLAT_HXX #define INCLUDED_VCL_SOURCE_FONTSUBSET_XLAT_HXX 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 |