followup code removal after changing virtual methods to non-virtual

This cleanups up indentation and removes dead classes.

This is a followup patch to commit
272b1dd55797aacf511fb4342b0054e3697243f6
"new loplugin: change virtual methods to non-virtual"

Change-Id: I1c2139589cf8cb23bb9808defe22c51039d38de1

12 files changed, 41 insertions, 70 deletions

diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx
index 6932bac8facb..fa275cc84038 100644
--- a/vcl/inc/PhysicalFontFace.hxx
+++ b/vcl/inc/PhysicalFontFace.hxx
@@ -54,8 +54,8 @@ public:
     // font instance specific data
     virtual ImplFontEntry*  CreateFontInstance( FontSelectPattern& ) const = 0;
 
-    int             GetHeight() const           { return mnHeight; }
-    int             GetWidth() const            { return mnWidth; }
+    int                     GetHeight() const           { return mnHeight; }
+    int                     GetWidth() const            { return mnWidth; }
     virtual sal_IntPtr      GetFontId() const = 0;
     int                     GetFontMagic() const        { return mnMagic; }
     bool                    IsScalable() const          { return (mnHeight == 0); }
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index a49962ee127b..2fec0559096c 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -583,7 +583,7 @@ public:
     const Image&    GetImage() const { return maImage; }
     void            SetImage( const Image& rImg ) { maImage = rImg; }
 
-    void    MBDown();
+    void            MBDown();
 
     boost::signals2::signal< void ( ImplWin* ) > buttonDownSignal;
     boost::signals2::signal< void ( UserDrawEvent* ) > userDrawSignal;
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index d5ec8272ab4a..17e2233f85b9 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -87,7 +87,7 @@ public:
     virtual SalGraphicsImpl*    GetImpl() const = 0;
 
     /// Check that our mpImpl is OpenGL and return the context, otherwise NULL.
-    OpenGLContext*      GetOpenGLContext() const;
+    OpenGLContext*              GetOpenGLContext() const;
 
     void                        setAntiAliasB2DDraw(bool bNew) { m_bAntiAliasB2DDraw = bNew; }
     bool                        getAntiAliasB2DDraw() const { return m_bAntiAliasB2DDraw; }
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index ae1fe9dda55c..e77cb0041c98 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -175,7 +175,7 @@ public:
     virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const = 0;
     virtual DeviceCoordinate GetTextWidth() const { return FillDXArray( NULL ); }
     virtual void    GetCaretPositions( int nArraySize, long* pCaretXArray ) const = 0;
-    bool    IsKashidaPosValid ( int /*nCharPos*/ ) const { return true; } // i60594
+    bool            IsKashidaPosValid ( int /*nCharPos*/ ) const { return true; } // i60594
 
     // methods using glyph indexing
     virtual int     GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdAry, Point& rPos, int&,
@@ -193,7 +193,7 @@ public:
     virtual void    MoveGlyph( int nStart, long nNewXPos ) = 0;
     virtual void    DropGlyph( int nStart ) = 0;
     virtual void    Simplify( bool bIsBase ) = 0;
-    void    DisableGlyphInjection( bool /*bDisable*/ ) {}
+    void            DisableGlyphInjection( bool /*bDisable*/ ) {}
 
 protected:
     // used by layout engines
@@ -240,7 +240,7 @@ public:
     // used only by OutputDevice::ImplLayout, TODO: make friend
     explicit        MultiSalLayout( SalLayout& rBaseLayout,
                                     const PhysicalFontFace* pBaseFont = NULL );
-    bool    AddFallback( SalLayout& rFallbackLayout,
+    bool            AddFallback( SalLayout& rFallbackLayout,
                                  ImplLayoutRuns&, const PhysicalFontFace* pFallbackFont );
     virtual bool    LayoutText( ImplLayoutArgs& ) SAL_OVERRIDE;
     virtual void    AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE;
diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx
index f09c19fe1a5a..54d87e5be7ce 100644
--- a/vcl/inc/salobj.hxx
+++ b/vcl/inc/salobj.hxx
@@ -51,12 +51,9 @@ public:
 
     virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight ) = 0;
     virtual void                    Show( bool bVisible ) = 0;
-    void                    Enable( bool /* nEnable */ ) {}
+    void                            Enable( bool /* nEnable */ ) {}
     virtual void                    GrabFocus() {}
 
-    void                    SetBackground() {}
-    void                    SetBackground( SalColor /* nSalColor */ ) {}
-
     virtual void                    SetForwardKey( bool /* bEnable */ ) {}
 
     virtual const SystemEnvData*    GetSystemData() const = 0;
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index 767c7c36f6af..56e08ad65c1c 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -25,7 +25,6 @@
 #include <vcl/image.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/controllayout.hxx>
-#include <vcl/ImageListProvider.hxx>
 
 #include <vector>
 
@@ -150,10 +149,6 @@ struct ImplToolBoxPrivateData
 
     Wallpaper   maDisplayBackground;
 
-    // support for highcontrast
-    vcl::IImageListProvider* mpImageListProvider;
-    vcl::ImageListType       meImageListType;
-
     bool    mbIsLocked:1,           // keeps last lock state from ImplDockingWindowWrapper
             mbAssumeDocked:1,       // only used during calculations to override current floating/popup mode
             mbAssumeFloating:1,
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index af530f867e0b..a11f1fa8b144 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -360,7 +360,7 @@ public:
     virtual void                SetTitle( const OUString& rTitle ) SAL_OVERRIDE;
     virtual void                SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
     virtual void                SetMenu( SalMenu *pSalMenu ) SAL_OVERRIDE;
-    SalMenu*            GetMenu( void );
+    SalMenu*                    GetMenu( void );
     virtual void                DrawMenuBar() SAL_OVERRIDE;
     void                        EnsureAppMenuWatch();
 
@@ -377,7 +377,7 @@ public:
     virtual void                GetWorkArea( Rectangle& rRect ) SAL_OVERRIDE;
     virtual SalFrame*           GetParent() const SAL_OVERRIDE;
     virtual void                SetWindowState( const SalFrameState* pState ) SAL_OVERRIDE;
-    virtual bool            GetWindowState( SalFrameState* pState ) SAL_OVERRIDE;
+    virtual bool                GetWindowState( SalFrameState* pState ) SAL_OVERRIDE;
     virtual void                ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) SAL_OVERRIDE;
     // Enable/Disable ScreenSaver, SystemAgents, ...
     virtual void                StartPresentation( bool bStart ) SAL_OVERRIDE;
@@ -402,8 +402,8 @@ public:
     virtual void                SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE;
     virtual void                EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE;
 
-    virtual OUString              GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
-    virtual bool            MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE;
+    virtual OUString            GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
+    virtual bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE;
 
     // returns the input language used for the last key stroke
     // may be LANGUAGE_DONTKNOW if not supported by the OS
@@ -435,19 +435,19 @@ public:
 
     // shaped system windows
     // set clip region to none (-> rectangular windows, normal state)
-    virtual void                    ResetClipRegion() SAL_OVERRIDE;
+    virtual void                ResetClipRegion() SAL_OVERRIDE;
     // start setting the clipregion consisting of nRects rectangles
-    virtual void                    BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE;
+    virtual void                BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE;
     // add a rectangle to the clip region
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
+    virtual void                UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
     // done setting up the clipregion
-    virtual void                    EndSetClipRegion() SAL_OVERRIDE;
+    virtual void                EndSetClipRegion() SAL_OVERRIDE;
 
-    static GtkSalFrame             *getFromWindow( GtkWindow *pWindow );
+    static GtkSalFrame         *getFromWindow( GtkWindow *pWindow );
 
-    void                    damaged (const basegfx::B2IBox& rDamageRect);
+    void                        damaged (const basegfx::B2IBox& rDamageRect);
 
-    virtual Window GetX11Window() SAL_OVERRIDE;
+    virtual Window              GetX11Window() SAL_OVERRIDE;
 };
 
 #define OOO_TYPE_FIXED ooo_fixed_get_type()
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 7659321f38b3..3a3d79e80702 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -58,14 +58,14 @@ public:
     GtkSalMenu( bool bMenuBar );
     virtual ~GtkSalMenu();
 
-    virtual bool            VisibleMenuBar() SAL_OVERRIDE;   // must return TRUE to actually DISPLAY native menu bars
+    virtual bool                VisibleMenuBar() SAL_OVERRIDE;   // must return TRUE to actually DISPLAY native menu bars
                                                     // otherwise only menu messages are processed (eg, OLE on Windows)
 
     virtual void                InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) SAL_OVERRIDE;
     virtual void                RemoveItem( unsigned nPos ) SAL_OVERRIDE;
     virtual void                SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) SAL_OVERRIDE;
     virtual void                SetFrame( const SalFrame* pFrame ) SAL_OVERRIDE;
-    const GtkSalFrame*  GetFrame() const;
+    const GtkSalFrame*          GetFrame() const;
     virtual void                CheckItem( unsigned nPos, bool bCheck ) SAL_OVERRIDE;
     virtual void                EnableItem( unsigned nPos, bool bEnable ) SAL_OVERRIDE;
     virtual void                ShowItem( unsigned nPos, bool bShow ) SAL_OVERRIDE;
@@ -74,16 +74,16 @@ public:
     virtual void                SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE;
     virtual void                GetSystemMenuData( SystemMenuData* pData ) SAL_OVERRIDE;
 
-    void                SetMenu( Menu* pMenu ) { mpVCLMenu = pMenu; }
-    Menu*               GetMenu() { return mpVCLMenu; }
-    GtkSalMenu*         GetParentSalMenu() { return mpParentSalMenu; }
-    void                SetMenuModel( GMenuModel* pMenuModel ) { mpMenuModel = pMenuModel; }
-    GMenuModel*         GetMenuModel() { return mpMenuModel; }
-    unsigned            GetItemCount() { return maItems.size(); }
-    GtkSalMenuItem*     GetItemAtPos( unsigned nPos ) { return maItems[ nPos ]; }
-    void                SetActionGroup( GActionGroup* pActionGroup ) { mpActionGroup = pActionGroup; }
-    GActionGroup*       GetActionGroup() { return mpActionGroup; }
-    bool            IsItemVisible( unsigned nPos );
+    void                        SetMenu( Menu* pMenu ) { mpVCLMenu = pMenu; }
+    Menu*                       GetMenu() { return mpVCLMenu; }
+    GtkSalMenu*                 GetParentSalMenu() { return mpParentSalMenu; }
+    void                        SetMenuModel( GMenuModel* pMenuModel ) { mpMenuModel = pMenuModel; }
+    GMenuModel*                 GetMenuModel() { return mpMenuModel; }
+    unsigned                    GetItemCount() { return maItems.size(); }
+    GtkSalMenuItem*             GetItemAtPos( unsigned nPos ) { return maItems[ nPos ]; }
+    void                        SetActionGroup( GActionGroup* pActionGroup ) { mpActionGroup = pActionGroup; }
+    GActionGroup*               GetActionGroup() { return mpActionGroup; }
+    bool                        IsItemVisible( unsigned nPos );
 
     void                        NativeSetItemText( unsigned nSection, unsigned nItemPos, const OUString& rText );
     void                        NativeSetItemCommand( unsigned nSection,
@@ -114,7 +114,7 @@ public:
 
     sal_uInt16          mnId;               // Item ID
     MenuItemType        mnType;             // Item type
-    bool            mbVisible;          // Item visibility.
+    bool                mbVisible;          // Item visibility.
     Menu*               mpVCLMenu;          // VCL Menu into which this menu item is inserted
     GtkSalMenu*         mpParentMenu;       // The menu into which this menu item is inserted
     GtkSalMenu*         mpSubMenu;          // Submenu of this item (if defined)
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 26bb5e9ec63e..4eac942d686b 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -259,7 +259,7 @@ protected:
     Cursor          aPointerCache_[POINTER_COUNT];
 
     // Keyboard
-    bool        bNumLockFromXS_;    // Num Lock handled by X Server
+    bool            bNumLockFromXS_;    // Num Lock handled by X Server
     int             nNumLockIndex_;     // modifier index in modmap
     int             nNumLockMask_;      // keyevent state mask for
     KeySym          nShiftKeySym_;      // first shift modifier
@@ -306,9 +306,9 @@ public:
     void            ModifierMapping();
     void            SimulateKeyPress( sal_uInt16 nKeyCode );
     KeyIndicatorState  GetIndicatorState() const;
-    OUString          GetKeyNameFromKeySym( KeySym keysym ) const;
-    OUString       GetKeyName( sal_uInt16 nKeyCode ) const;
-    sal_uInt16          GetKeyCode( KeySym keysym, char*pcPrintable ) const;
+    OUString        GetKeyNameFromKeySym( KeySym keysym ) const;
+    OUString        GetKeyName( sal_uInt16 nKeyCode ) const;
+    sal_uInt16      GetKeyCode( KeySym keysym, char*pcPrintable ) const;
     KeySym          GetKeySym( XKeyEvent      *pEvent,
                                unsigned char  *pPrintable,
                                int            *pLen,
@@ -336,7 +336,7 @@ public:
     const Size&     GetScreenSize( SalX11Screen nXScreen ) const { return getDataForScreen( nXScreen ).m_aSize; }
     srv_vendor_t    GetServerVendor() const { return meServerVendor; }
     void            SetServerVendor() { meServerVendor = sal_GetServerVendor(pDisp_); }
-    bool        IsDisplay() const { return !!pXLib_; }
+    bool            IsDisplay() const { return !!pXLib_; }
     GC              GetMonoGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aMonoGC; }
     GC              GetCopyGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aCopyGC; }
     GC              GetAndInvertedGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aAndInvertedGC; }
@@ -395,10 +395,10 @@ public:
     virtual ~SalX11Display();
 
     virtual bool        Dispatch( XEvent *pEvent ) SAL_OVERRIDE;
-    void        Yield();
+    void                Yield();
     virtual void        PostUserEvent() SAL_OVERRIDE;
 
-    bool            IsEvent();
+    bool                IsEvent();
     void                SetupInput( SalI18N_InputMethod *pInputMethod );
 };
 
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index af894caef2c4..2ca876e82614 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -250,7 +250,7 @@ public:
                                         const SalBitmap& rSourceBitmap,
                                         const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
 
-    bool                    drawAlphaBitmap(
+    bool                            drawAlphaBitmap(
                                         const SalTwoRect&,
                                         const SalBitmap& rBitmap );
 
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index ff8372117b77..bd6416686242 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1487,8 +1487,6 @@ void ToolBox::ImplInitSettings( bool bFont,
                 SetBackground( aColor );
                 SetPaintTransparent( false );
                 SetParentClipMode( 0 );
-
-                ImplUpdateImageList();
             }
         }
     }
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 402757ab18dd..e1cad517c76d 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -30,7 +30,6 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/menu.hxx>
-#include <vcl/ImageListProvider.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/IconThemeInfo.hxx>
 
@@ -52,9 +51,7 @@ using namespace com::sun::star;
 #define TB_SEP_SIZE             8
 
 ImplToolBoxPrivateData::ImplToolBoxPrivateData() :
-        m_pLayoutData( NULL ),
-        mpImageListProvider( NULL ),
-        meImageListType( vcl::IMAGELISTTYPE_UNKNOWN )
+        m_pLayoutData( NULL )
 {
     meButtonSize = TOOLBOX_BUTTONSIZE_DONTCARE;
     mpMenu = new PopupMenu();
@@ -2052,20 +2049,4 @@ void ToolBox::WillUsePopupMode( bool b )
     mpData->mbWillUsePopupMode = b;
 }
 
-void ToolBox::ImplUpdateImageList()
-{
-    if (mpData->mpImageListProvider != NULL)
-    {
-        try
-        {
-            ImageListType eType = vcl::HIGHCONTRAST_NO;
-            if (eType != mpData->meImageListType)
-            {
-                mpData->meImageListType = eType;
-            }
-        }
-        catch (com::sun::star::lang::IllegalArgumentException &) {}
-    }
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */