[Libreoffice-commits] core.git: solenv/clang-format sw/source

[Miklos Vajna]

 solenv/clang-format/ClangFormat.pm          |    4 ++--
 sw/source/filter/ww8/rtfattributeoutput.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4e0dd43f9a90917676a46e451abaaaa2e52d7f2e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Nov 28 22:49:30 2017 +0100

    clang-format: don't pick up non-existing binary from PATH
    
    When /opt/lo/bin/clang-format was missing, we "found" clang-format in
    the last item of PATH, which doesn't make sense.
    
    (Fix a spelling error in a formatted file to trigger the hook as part of
    CI.)
    
    Change-Id: I3b56a8ad02b4a55dba58e07286e31436a2842cf6

diff --git a/solenv/clang-format/ClangFormat.pm b/solenv/clang-format/ClangFormat.pm
index 8cd891229843..26de82de06e5 100644
--- a/solenv/clang-format/ClangFormat.pm
+++ b/solenv/clang-format/ClangFormat.pm
@@ -73,9 +73,9 @@ sub find()
         {
             foreach my $dir (split /:/, $ENV{PATH})
             {
-                $clang_format = "$dir/clang-format";
-                if (is_matching_clang_format_version($clang_format, $version))
+                if (is_matching_clang_format_version("$dir/clang-format", $version))
                 {
+                    $clang_format = "$dir/clang-format";
                     last;
                 }
             }
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 6c8bb3390979..ae9bc3f7efb3 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -787,7 +787,7 @@ void RtfAttributeOutput::TableDefaultBorders(
         static const char* aBorderNames[]
             = { OOO_STRING_SVTOOLS_RTF_CLBRDRT, OOO_STRING_SVTOOLS_RTF_CLBRDRL,
                 OOO_STRING_SVTOOLS_RTF_CLBRDRB, OOO_STRING_SVTOOLS_RTF_CLBRDRR };
-        //Yes left and top are swapped with eachother for cell padding! Because
+        //Yes left and top are swapped with each other for cell padding! Because
         //that's what the thundering annoying rtf export/import word xp does.
         static const char* aCellPadNames[]
             = { OOO_STRING_SVTOOLS_RTF_CLPADL, OOO_STRING_SVTOOLS_RTF_CLPADT,