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

[Stephan Bergmann]

 cui/source/inc/ControlFocusHelper.hxx |   44 ----------------------------------
 cui/source/inc/dbregister.hxx         |    1 
 cui/source/inc/optpath.hxx            |    1 
 cui/source/options/optpath.cxx        |   11 --------
 4 files changed, 57 deletions(-)

New commits:
commit 19b91e0d76df10646cd261431c7847e3447e08b1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 6 09:55:21 2015 +0200

    Remove unused SvxControlFocusHelper
    
    Change-Id: I3bdadb02918bf109e7e93ea0c7c709f018caed4a

diff --git a/cui/source/inc/ControlFocusHelper.hxx b/cui/source/inc/ControlFocusHelper.hxx
deleted file mode 100644
index 6530f3c..0000000
--- a/cui/source/inc/ControlFocusHelper.hxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_CUI_SOURCE_INC_CONTROLFOCUSHELPER_HXX
-#define INCLUDED_CUI_SOURCE_INC_CONTROLFOCUSHELPER_HXX
-
-#include <vcl/ctrl.hxx>
-
-// class SvxControlFocusHelper ---------------------------------------------
-
-class SvxControlFocusHelper : public Control
-{
-private:
-    VclPtr<Control>        m_pFocusCtrl;
-
-public:
-    SvxControlFocusHelper( vcl::Window* pParent, const ResId& rId ) :
-        Control( pParent, rId ), m_pFocusCtrl( NULL ) {}
-    virtual ~SvxControlFocusHelper();
-    virtual void dispose() SAL_OVERRIDE;
-
-    void            SetFocusControl( Control* pCtrl ) { m_pFocusCtrl = pCtrl; }
-
-    virtual bool    Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
-};
-
-#endif // INCLUDED_CUI_SOURCE_INC_CONTROLFOCUSHELPER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 0c9d91e..00c26d1 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -25,7 +25,6 @@
 #include <svl/poolitem.hxx>
 #include <svtools/simptabl.hxx>
 #include "optpath.hxx"
-#include "ControlFocusHelper.hxx"
 
 class SvTreeListEntry;
 namespace svx
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index a394d09..d793485 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -23,7 +23,6 @@
 #include <svtools/simptabl.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/group.hxx>
-#include "ControlFocusHelper.hxx"
 
 #include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
 #include <svtools/dialogclosedlistener.hxx>
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 218f814..0bab1a9 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -161,17 +161,6 @@ OUString Convert_Impl( const OUString& rValue )
     return aReturn;
 }
 
-// class SvxControlFocusHelper ---------------------------------------------
-
-bool SvxControlFocusHelper::Notify( NotifyEvent& rNEvt )
-{
-    bool nRet = Control::Notify( rNEvt );
-
-    if ( m_pFocusCtrl && rNEvt.GetWindow() != m_pFocusCtrl && rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
-        m_pFocusCtrl->GrabFocus();
-    return nRet;
-}
-
 // functions -------------------------------------------------------------
 
 bool IsMultiPath_Impl( const sal_uInt16 nIndex )