[Libreoffice-commits] core.git: include/sfx2 include/svtools include/vcl vcl/inc vcl/source

[Tor Lillqvist]

 include/sfx2/module.hxx        |    2 +-
 include/svtools/parrtf.hxx     |    2 --
 include/svtools/svparser.hxx   |    4 ++--
 include/vcl/window.hxx         |    8 ++++----
 vcl/inc/generic/glyphcache.hxx |    2 +-
 vcl/source/fontsubset/cff.cxx  |    2 +-
 6 files changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 445336074c2441a59377b313fc6da2396554abed
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Oct 6 20:57:31 2014 +0300

    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

diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 77ba766..a04b8af 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 8b596ea..2730d5a 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 55a61df..4d176ec 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 ae94819..decc15c 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 40a07da..1a3da60 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 8293279..1bb6f06 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;