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

[Libreoffice Gerrit user]

 sw/source/core/docnode/nodes.cxx        |    4 ++--
 vcl/source/window/window.cxx            |    8 ++++----
 vcl/source/window/winproc.cxx           |    2 +-
 xmlsecurity/qa/unit/signing/signing.cxx |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit a04340a08c9f2a0e7208f3109fbcc97ab19fccb3
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Fri Nov 16 00:48:35 2018 +0100
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Fri Nov 16 07:19:18 2018 +0100

    Fix typos
    
    Change-Id: I033731251c4fffd759144f5bd9d6b9737de48c80
    Reviewed-on: https://gerrit.libreoffice.org/63455
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 5415901819ff..83e43c6d0d2a 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -1250,7 +1250,7 @@ void SwNodes::GoStartOfSection(SwNodeIndex *pIdx)
     // after the next start node
     SwNodeIndex aTmp( *pIdx->GetNode().StartOfSectionNode(), +1 );
 
-    // If index points to no ContentNode, than go to one.
+    // If index points to no ContentNode, then go to one.
     // If there is no further available, do not change the index' position!
     while( !aTmp.GetNode().IsContentNode() )
     {   // go from this StartNode (can only be one) to its end
@@ -1455,7 +1455,7 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
 
     if( pSrcNd )
     {
-        // if the first node is a TextNode, than there must
+        // if the first node is a TextNode, then there must
         // be also a TextNode in the NodesArray to store the content
         if( !pDestNd )
         {
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 8af6a6010dcf..349d4d0b5787 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2549,7 +2549,7 @@ void Window::EnableInput( bool bEnable, const vcl::Window* pExcludeWindow )
     EnableInput( bEnable );
 
     // pExecuteWindow is the first Overlap-Frame --> if this
-    // shouldn't be the case, than this must be changed in dialog.cxx
+    // shouldn't be the case, then this must be changed in dialog.cxx
     if( pExcludeWindow )
         pExcludeWindow = pExcludeWindow->ImplGetFirstOverlapWindow();
     vcl::Window* pSysWin = mpWindowImpl->mpFrameWindow->mpWindowImpl->mpFrameData->mpFirstOverlap;
@@ -2559,7 +2559,7 @@ void Window::EnableInput( bool bEnable, const vcl::Window* pExcludeWindow )
         if ( ImplGetFirstOverlapWindow()->ImplIsWindowOrChild( pSysWin, true ) )
         {
             // Is Window not in the exclude window path or not the
-            // exclude window, than change the status
+            // exclude window, then change the status
             if ( !pExcludeWindow || !pExcludeWindow->ImplIsWindowOrChild( pSysWin, true ) )
                 pSysWin->EnableInput( bEnable );
         }
@@ -2576,7 +2576,7 @@ void Window::EnableInput( bool bEnable, const vcl::Window* pExcludeWindow )
             if ( ImplGetFirstOverlapWindow()->ImplIsWindowOrChild( pFrameWin, true ) )
             {
                 // Is Window not in the exclude window path or not the
-                // exclude window, than change the status
+                // exclude window, then change the status
                 if ( !pExcludeWindow || !pExcludeWindow->ImplIsWindowOrChild( pFrameWin, true ) )
                     pFrameWin->EnableInput( bEnable );
             }
@@ -2594,7 +2594,7 @@ void Window::EnableInput( bool bEnable, const vcl::Window* pExcludeWindow )
             if ( ImplGetFirstOverlapWindow()->ImplIsWindowOrChild( elem, true ) )
             {
                 // Is Window not in the exclude window path or not the
-                // exclude window, than change the status
+                // exclude window, then change the status
                 if ( !pExcludeWindow || !pExcludeWindow->ImplIsWindowOrChild( elem, true ) )
                     elem->EnableInput( bEnable );
             }
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 0079d85a8dab..247b6443e366 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -832,7 +832,7 @@ static vcl::Window* ImplGetKeyInputWindow( vcl::Window* pWindow )
 
     pChild = pChild->ImplGetWindowImpl()->mpFrameData->mpFocusWin;
 
-    // no child - than no input
+    // no child - then no input
     if ( !pChild )
         return nullptr;
 
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx
index e6054c5f6129..411cfceecf82 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -208,7 +208,7 @@ void SigningTest::setUp()
     CPPUNIT_ASSERT_MESSAGE(OUStringToOString(aTargetPath, RTL_TEXTENCODING_UTF8).getStr(), ok);
     m_gpgconfCommandPrefix += "GNUPGHOME=" + path + " " GPGME_GPGCONF;
     // HAVE_GPGCONF_SOCKETDIR is only defined in configure.ac for Linux for now, so (a) std::system
-    // behavior will conform to POSIX (and the relevant env var to setis named LD_LIBRARY_PATH), and
+    // behavior will conform to POSIX (and the relevant env var to set is named LD_LIBRARY_PATH), and
     // (b) gpgconf --create-socketdir should return zero:
     OString cmd = m_gpgconfCommandPrefix + " --create-socketdir";
     int res = std::system(cmd.getStr());