From 0ef2999f7b498686ad38749b93f0591dd52bcc50 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sat, 26 Apr 2014 17:19:32 +0200 Subject: vcl: MenuFloatingWindow::InitClipRegion() should not be virtual When OutputDevice's ImplInitClipRegion got marked as virtual, the compiler raised a warning about colliding method names in MenuFloatingWindow, and this got fixed by making the method virtual. But making it virtual just makes the warning go away, doesn't fix the real problem, that OutputDevice's ImplInitClipRegion() is no longer called, leading to strange missing text in the menus. In the meantime also ImplInitClipRegion() got renamed to InitClipRegion(). Fix the problem by renaming InitClipRegion() to InitMenuClipRegion() in MenuFloatingWindow. Regression from 95711f5b9e7b6a982d1762d37d5a38e0f40b86f9 (fdo#74702 Move ImplInitClipRegion Window code out of OutputDevice, 2014-04-25). Change-Id: Ibeb5e8e99bf4369b349ac44376a2c217786ef318 --- vcl/source/window/menu.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vcl/source/window/menu.cxx') diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 143a95ea3cd0..12dd097c2412 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -509,7 +509,7 @@ private: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; protected: Region ImplCalcClipRegion( bool bIncludeLogo = true ) const; - virtual void InitClipRegion() SAL_OVERRIDE; + void InitMenuClipRegion(); void ImplDrawScroller( bool bUp ); using Window::ImplScroll; void ImplScroll( const Point& rMousePos ); @@ -4032,7 +4032,7 @@ Region MenuFloatingWindow::ImplCalcClipRegion( bool bIncludeLogo ) const return aRegion; } -void MenuFloatingWindow::InitClipRegion() +void MenuFloatingWindow::InitMenuClipRegion() { if ( IsScrollMenu() ) { -- cgit