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

[Johnny_M (via logerrit)]

 vcl/source/window/dlgctrl.cxx |   40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

New commits:
commit 00bf7320580bd4a8f8d640bb75ae819acc6499a3
Author:     Johnny_M <klasse at partyheld.de>
AuthorDate: Fri Mar 13 12:44:00 2020 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Mon Mar 23 14:00:04 2020 +0100

    Translate German variable names
    
    Formular -> Form
    
    Change-Id: I2efb4a8df4898d73e4cf0ebaf93df0adccb2a562
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90463
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index f63cb6782b39..45582a7a4e50 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -768,35 +768,35 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput )
                 GetDlgWindowType nType;
                 GetFocusFlags    nGetFocusFlags = GetFocusFlags::Tab;
                 sal_uInt16  nNewIndex;
-                bool        bFormular = false;
+                bool        bForm = false;
 
                 // for Ctrl-Tab check if we want to jump to next template
                 if ( aKeyCode.IsMod1() )
                 {
                     // search group
-                    vcl::Window* pFormularFirstWindow = nullptr;
-                    vcl::Window* pLastFormularFirstWindow = nullptr;
+                    vcl::Window* pFormFirstWindow = nullptr;
+                    vcl::Window* pLastFormFirstWindow = nullptr;
                     pTempWindow = ImplGetChildWindow( this, 0, iTemp, false );
-                    vcl::Window* pPrevFirstFormularFirstWindow = nullptr;
-                    vcl::Window* pFirstFormularFirstWindow = pTempWindow;
+                    vcl::Window* pPrevFirstFormFirstWindow = nullptr;
+                    vcl::Window* pFirstFormFirstWindow = pTempWindow;
                     while ( pTempWindow )
                     {
                         if ( pTempWindow->ImplGetWindow()->IsDialogControlStart() )
                         {
                             if ( iTemp != 0 )
-                                bFormular = true;
+                                bForm = true;
                             if ( aKeyCode.IsShift() )
                             {
                                 if ( iTemp <= nIndex )
-                                    pFormularFirstWindow = pPrevFirstFormularFirstWindow;
-                                pPrevFirstFormularFirstWindow = pTempWindow;
+                                    pFormFirstWindow = pPrevFirstFormFirstWindow;
+                                pPrevFirstFormFirstWindow = pTempWindow;
                             }
                             else
                             {
-                                if ( (iTemp > nIndex) && !pFormularFirstWindow )
-                                    pFormularFirstWindow = pTempWindow;
+                                if ( (iTemp > nIndex) && !pFormFirstWindow )
+                                    pFormFirstWindow = pTempWindow;
                             }
-                            pLastFormularFirstWindow = pTempWindow;
+                            pLastFormFirstWindow = pTempWindow;
                         }
 
                         pTempWindow = ImplGetNextWindow( this, iTemp, iTemp, false );
@@ -804,34 +804,34 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput )
                             pTempWindow = nullptr;
                     }
 
-                    if ( bFormular )
+                    if ( bForm )
                     {
-                        if ( !pFormularFirstWindow )
+                        if ( !pFormFirstWindow )
                         {
                             if ( aKeyCode.IsShift() )
-                                pFormularFirstWindow = pLastFormularFirstWindow;
+                                pFormFirstWindow = pLastFormFirstWindow;
                             else
-                                pFormularFirstWindow = pFirstFormularFirstWindow;
+                                pFormFirstWindow = pFirstFormFirstWindow;
                         }
 
                         sal_uInt16 nFoundFormStart = 0;
                         sal_uInt16 nFoundFormEnd = 0;
                         sal_uInt16 nTempIndex = 0;
-                        if ( ::ImplFindDlgCtrlWindow( this, pFormularFirstWindow, nTempIndex,
+                        if ( ::ImplFindDlgCtrlWindow( this, pFormFirstWindow, nTempIndex,
                                                       nFoundFormStart, nFoundFormEnd ) )
                         {
                             nTempIndex = nFoundFormStart;
-                            pFormularFirstWindow = ImplGetDlgWindow( nTempIndex, GetDlgWindowType::First, nFoundFormStart, nFoundFormEnd );
-                            if ( pFormularFirstWindow )
+                            pFormFirstWindow = ImplGetDlgWindow( nTempIndex, GetDlgWindowType::First, nFoundFormStart, nFoundFormEnd );
+                            if ( pFormFirstWindow )
                             {
-                                pFormularFirstWindow->ImplControlFocus();
+                                pFormFirstWindow->ImplControlFocus();
                                 return true;
                             }
                         }
                     }
                 }
 
-                if ( !bFormular )
+                if ( !bForm )
                 {
                     // Only use Ctrl-TAB if it was allowed for the whole
                     // dialog or for the current control (#103667#)