summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-10-06 20:57:31 +0300
committerTor Lillqvist <tml@collabora.com>2014-10-06 22:39:18 +0300
commit445336074c2441a59377b313fc6da2396554abed (patch)
tree8a7d8c56701d53faaf74f228036d0570338e74ca
parentce5cc7afb0f1c99237d04e0c754527c725d8491c (diff)
Remove pointless commented-out 'virtual' keywords
Nobody knows any more what such a metacomment was supposed to mean, if it had any deeper meaning at all. Change-Id: Iefb4fedc7b833c09ee0e39b3eb28202229323ef2
-rw-r--r--include/sfx2/module.hxx2
-rw-r--r--include/svtools/parrtf.hxx2
-rw-r--r--include/svtools/svparser.hxx4
-rw-r--r--include/vcl/window.hxx8
-rw-r--r--vcl/inc/generic/glyphcache.hxx2
-rw-r--r--vcl/source/fontsubset/cff.cxx2
6 files changed, 9 insertions, 11 deletions
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 77ba76675543..a04b8afcfc1e 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -90,7 +90,7 @@ public:
const SfxItemSet& rSet );
virtual void Invalidate(sal_uInt16 nId = 0) SAL_OVERRIDE;
- /*virtual*/ bool IsChildWindowAvailable( const sal_uInt16 i_nId, const SfxViewFrame* i_pViewFrame ) const;
+ bool IsChildWindowAvailable( const sal_uInt16 i_nId, const SfxViewFrame* i_pViewFrame ) const;
static SfxModule* GetActiveModule( SfxViewFrame* pFrame=NULL );
static FieldUnit GetCurrentFieldUnit();
diff --git a/include/svtools/parrtf.hxx b/include/svtools/parrtf.hxx
index 8b596eaa5594..2730d5a5b551 100644
--- a/include/svtools/parrtf.hxx
+++ b/include/svtools/parrtf.hxx
@@ -75,8 +75,6 @@ public:
int GetOpenBrakets() const { return nOpenBrakets; }
// fuers asynchrone lesen aus dem SvStream
-// virtual void SaveState( int nToken );
-// virtual void RestoreState();
virtual void Continue( int nToken ) SAL_OVERRIDE;
};
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index 55a61df65ead..4d176ec90cfd 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -143,8 +143,8 @@ public:
long CallAsyncCallLink() { return NewDataRead( this, 0 ); }
// fuers asynchrone lesen aus dem SvStream
- /*virtual*/ void SaveState( int nToken );
- /*virtual*/ void RestoreState();
+ void SaveState( int nToken );
+ void RestoreState();
virtual void Continue( int nToken );
inline void SetDownloadingFile( bool bSet ) { bDownloadingFile = bSet; }
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index ae9481973ba0..decc15c1c88e 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -709,10 +709,10 @@ public:
virtual bool Notify( NotifyEvent& rNEvt );
virtual vcl::Window* GetPreferredKeyInputWindow();
- /*virtual*/ void AddEventListener( const Link& rEventListener );
- /*virtual*/ void RemoveEventListener( const Link& rEventListener );
- /*virtual*/ void AddChildEventListener( const Link& rEventListener );
- /*virtual*/ void RemoveChildEventListener( const Link& rEventListener );
+ void AddEventListener( const Link& rEventListener );
+ void RemoveEventListener( const Link& rEventListener );
+ void AddChildEventListener( const Link& rEventListener );
+ void RemoveChildEventListener( const Link& rEventListener );
ImplSVEvent * PostUserEvent( const Link& rLink, void* pCaller = NULL );
void RemoveUserEvent( ImplSVEvent * nUserEvent );
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 40a07dad1640..1a3da60118fc 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -55,7 +55,7 @@ class VCL_DLLPUBLIC GlyphCache
{
public:
explicit GlyphCache( GlyphCachePeer& );
- /*virtual*/ ~GlyphCache();
+ ~GlyphCache();
static GlyphCache& GetInstance();
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 8293279907fa..1bb6f06f437f 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -1713,7 +1713,7 @@ class Type1Emitter
{
public:
explicit Type1Emitter( FILE* pOutFile, bool bPfbSubset = true);
- /*virtual*/ ~Type1Emitter( void);
+ ~Type1Emitter( void);
void setSubsetName( const char* );
size_t emitRawData( const char* pData, size_t nLength) const;