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

Philipp Hofer (via logerrit) logerrit at kemper.freedesktop.org
Fri Nov 13 07:22:48 UTC 2020


 l10ntools/inc/cfglex.hxx        |    6 +++---
 l10ntools/source/lngex.cxx      |   17 ++++++++---------
 solenv/clang-format/excludelist |    2 --
 3 files changed, 11 insertions(+), 14 deletions(-)

New commits:
commit 635bc2ea81fd9493a2997e89c2de5aa7d8405578
Author:     Philipp Hofer <philipp.hofer at protonmail.com>
AuthorDate: Thu Nov 12 13:04:58 2020 +0100
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Fri Nov 13 08:21:52 2020 +0100

    tdf#123936 Formatting files in module l10ntools with clang-format
    
    Change-Id: I5f8c2aec02e160a22e9ff484170303927f0c9c05
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105686
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/l10ntools/inc/cfglex.hxx b/l10ntools/inc/cfglex.hxx
index bc474a09bba7..af0324f64220 100644
--- a/l10ntools/inc/cfglex.hxx
+++ b/l10ntools/inc/cfglex.hxx
@@ -24,10 +24,10 @@
 
 #include <stdio.h>
 
-extern "C" void workOnTokenSet( int, char* );
-extern "C" FILE * init(int, char **);
+extern "C" void workOnTokenSet(int, char*);
+extern "C" FILE* init(int, char**);
 
-void yyerror(char const *);
+void yyerror(char const*);
 
 #endif
 
diff --git a/l10ntools/source/lngex.cxx b/l10ntools/source/lngex.cxx
index 0d8bc6b9361f..7435c063ed1c 100644
--- a/l10ntools/source/lngex.cxx
+++ b/l10ntools/source/lngex.cxx
@@ -23,21 +23,20 @@
 
 #include <lngmerge.hxx>
 
-SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
-
+SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
+{
     common::HandledArgs aArgs;
-    if ( !common::handleArguments(argc, argv, aArgs) )
+    if (!common::handleArguments(argc, argv, aArgs))
     {
-        common::writeUsage("ulfex","*.ulf");
+        common::writeUsage("ulfex", "*.ulf");
         return 1;
     }
 
-    LngParser aParser( aArgs.m_sInputFile );
-    if ( aArgs.m_bMergeMode )
-        aParser.Merge(
-            aArgs.m_sMergeSrc, aArgs.m_sOutputFile, aArgs.m_sLanguage );
+    LngParser aParser(aArgs.m_sInputFile);
+    if (aArgs.m_bMergeMode)
+        aParser.Merge(aArgs.m_sMergeSrc, aArgs.m_sOutputFile, aArgs.m_sLanguage);
     else
-        aParser.CreatePO( aArgs.m_sOutputFile );
+        aParser.CreatePO(aArgs.m_sOutputFile);
 
     return 0;
 }
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 78ce6e8527d8..01d6908c98b8 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -7442,7 +7442,6 @@ jvmfwk/source/framework.hxx
 jvmfwk/source/fwkbase.cxx
 jvmfwk/source/fwkutil.cxx
 jvmfwk/source/libxmlutil.cxx
-l10ntools/inc/cfglex.hxx
 l10ntools/inc/cfgmerge.hxx
 l10ntools/inc/common.hxx
 l10ntools/inc/export.hxx
@@ -7462,7 +7461,6 @@ l10ntools/source/helper.cxx
 l10ntools/source/helpex.cxx
 l10ntools/source/helpmerge.cxx
 l10ntools/source/idxdict/idxdict.cxx
-l10ntools/source/lngex.cxx
 l10ntools/source/lngmerge.cxx
 l10ntools/source/localize.cxx
 l10ntools/source/merge.cxx


More information about the Libreoffice-commits mailing list