[Libreoffice-commits] core.git: vcl/source

Chris Sherlock chris.sherlock79 at gmail.com
Fri May 23 23:38:26 PDT 2014


 vcl/source/window/window.cxx |   13 -------------
 1 file changed, 13 deletions(-)

New commits:
commit adb7236edc10c1ab8d53ddd160053e378ce59189
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Sat May 24 16:37:49 2014 +1000

    vcl: remove commented out code from Window::HasFocus()
    
    Change-Id: Ic3b1340cf6ba19d43d31570f9643ae0451e1fbac

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index d8435a8..09e43ed 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3111,19 +3111,6 @@ void Window::GrabFocus()
 
 bool Window::HasFocus() const
 {
-
-    // #107575# the first floating window always has the keyboard focus, see also winproc.cxx: ImplGetKeyInputWindow()
-    //  task was shifted to 6.y, so its commented out
-    /*
-    Window* pFocusWin = ImplGetSVData()->maWinData.mpFirstFloat;
-    if( pFocusWin && pFocusWin->mpWindowImpl->mbFloatWin && ((FloatingWindow *)pFocusWin)->GrabsFocus() )
-        pFocusWin = pFocusWin->GetPreferredKeyInputWindow();
-    else
-        pFocusWin = ImplGetSVData()->maWinData.mpFocusWin;
-
-    return (this == pFocusWin);
-    */
-
     return (this == ImplGetSVData()->maWinData.mpFocusWin);
 }
 


More information about the Libreoffice-commits mailing list