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

[Caolán McNamara (via logerrit)]

 include/vcl/accel.hxx         |    2 --
 vcl/inc/svdata.hxx            |    1 +
 vcl/source/window/dialog.cxx  |    2 +-
 vcl/source/window/dockwin.cxx |    2 +-
 vcl/source/window/syswin.cxx  |    2 +-
 vcl/source/window/tabpage.cxx |    4 ++--
 6 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 41f1d389d4b513a7f616542d00fd58268ab5ea07
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Aug 4 19:45:25 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Aug 4 21:49:45 2021 +0200

    GenerateAutoMnemonicsOnHierarchy is no longer used outside vcl
    
    This effectively reverts commit 76be678e7478e4863a8360e26425a39afa5af4fb.
    "rename ImplWindowAutoMnemonic and expose"
    
    Change-Id: Ibeeeda68d96286e74113a7567ef12dae3a80cf48
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120012
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx
index 2aa951b47293..f48c05c21ba8 100644
--- a/include/vcl/accel.hxx
+++ b/include/vcl/accel.hxx
@@ -77,8 +77,6 @@ public:
     void                    SetSelectHdl( const Link<Accelerator&,void>& rLink ) { maSelectHdl = rLink; }
 
     Accelerator&            operator=( const Accelerator& rAccel );
-
-    static void             GenerateAutoMnemonicsOnHierarchy(const vcl::Window* pWindow);
 };
 
 #endif // INCLUDED_VCL_ACCEL_HXX
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 2f962291725b..06515c5ccbb2 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -433,6 +433,7 @@ const std::locale& ImplGetResLocale();
 VCL_PLUGIN_PUBLIC OUString VclResId(TranslateId sContextAndId);
 DockingManager*     ImplGetDockingManager();
 BlendFrameCache*    ImplGetBlendFrameCache();
+void GenerateAutoMnemonicsOnHierarchy(const vcl::Window* pWindow);
 
 VCL_PLUGIN_PUBLIC ImplSVHelpData& ImplGetSVHelpData();
 
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index f9c6e3b1b503..9cb7fb142c5f 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -201,7 +201,7 @@ vcl::Window * lastLogicalChildOfParent(const vcl::Window *pTopLevel)
     return const_cast<vcl::Window *>(pChild);
 }
 
-void Accelerator::GenerateAutoMnemonicsOnHierarchy(const vcl::Window* pWindow)
+void GenerateAutoMnemonicsOnHierarchy(const vcl::Window* pWindow)
 {
     MnemonicGenerator   aMnemonicGenerator;
     vcl::Window*                 pGetChild;
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 25890e6627a2..619d8fbb6093 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -643,7 +643,7 @@ void DockingWindow::Resizing( Size& )
 void DockingWindow::DoInitialLayout()
 {
     if (GetSettings().GetStyleSettings().GetAutoMnemonic())
-       Accelerator::GenerateAutoMnemonicsOnHierarchy(this);
+       GenerateAutoMnemonicsOnHierarchy(this);
 
     if (isLayoutEnabled())
     {
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index ef0f7c0af90d..3d8a2dd18a06 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -1097,7 +1097,7 @@ void SystemWindow::setOptimalLayoutSize()
 void SystemWindow::DoInitialLayout()
 {
     if (GetSettings().GetStyleSettings().GetAutoMnemonic())
-       Accelerator::GenerateAutoMnemonicsOnHierarchy(this);
+       GenerateAutoMnemonicsOnHierarchy(this);
 
     if (isLayoutEnabled())
     {
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index f3acc5998ec3..784c2366bf48 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/accel.hxx>
 #include <vcl/event.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/scrbar.hxx>
+#include <svdata.hxx>
 
 void TabPage::ImplInit( vcl::Window* pParent, WinBits nStyle )
 {
@@ -119,7 +119,7 @@ void TabPage::StateChanged( StateChangedType nType )
     if ( nType == StateChangedType::InitShow )
     {
         if (GetSettings().GetStyleSettings().GetAutoMnemonic())
-            Accelerator::GenerateAutoMnemonicsOnHierarchy(this);
+            GenerateAutoMnemonicsOnHierarchy(this);
         // FIXME: no layouting, workaround some clipping issues
         ImplAdjustNWFSizes();
     }