[Libreoffice-commits] core.git: connectivity/source idlc/source l10ntools/source

[Libreoffice Gerrit user]

 connectivity/source/parse/sqlflex.l |   39 +++++++++++++++++++-----------------
 idlc/source/scanner.l               |    3 ++
 l10ntools/source/cfglex.l           |    6 ++++-
 l10ntools/source/xrmlex.l           |    6 ++++-
 4 files changed, 34 insertions(+), 20 deletions(-)

New commits:
commit eea0b1f88ee1ffe19aae3b1e95fe27e5ef9b5676
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Feb 27 13:07:53 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Feb 27 15:19:11 2019 +0100

    Add missing modelines to .l files
    
    ...and change connectivity/source/parse/sqlflex.l license header from using
    (unusual, anyway) // comments to using /* */ comment, so that it can go before
    Flex's opening %{
    
    Change-Id: I371890e937cc5055405c17226dd87ba1694688aa
    Reviewed-on: https://gerrit.libreoffice.org/68433
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index fc085ae9df57..9dfcb98a265b 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -1,22 +1,23 @@
-%{
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
-//
-// This file is part of the LibreOffice project.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-//
-// This file incorporates work covered by the following license notice:
-//
-//   Licensed to the Apache Software Foundation (ASF) under one or more
-//   contributor license agreements. See the NOTICE file distributed
-//   with this work for additional information regarding copyright
-//   ownership. The ASF licenses this file to you under the Apache
-//   License, Version 2.0 (the "License"); you may not use this file
-//   except in compliance with the License. You may obtain a copy of
-//   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-//
+%{
 
 #include "sal/config.h"
 
@@ -801,3 +802,5 @@ sal_Int32 OSQLScanner::SQLlex()
 {
 	return SQLyylex();
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l
index a7c23f458b96..91bf9f2646a6 100644
--- a/idlc/source/scanner.l
+++ b/idlc/source/scanner.l
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -519,3 +520,5 @@ published       return IDL_PUBLISHED;
 }
 
 %%
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l
index fe53a88507e1..8b19ad61466c 100644
--- a/l10ntools/source/cfglex.l
+++ b/l10ntools/source/cfglex.l
@@ -1,4 +1,4 @@
-%{
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+%{
+
 /*
  * lexer for parsing cfg source files
  */
@@ -167,3 +169,5 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
     yylex();
     return EXIT_SUCCESS;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l
index 4bd17ec5a3ac..34f37aa8f74b 100644
--- a/l10ntools/source/xrmlex.l
+++ b/l10ntools/source/xrmlex.l
@@ -1,4 +1,4 @@
-%{
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+%{
+
 /*
  * lexer for parsing xml-property source files (*.xml)
  */
@@ -223,3 +225,5 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
 	/* return error level */
 	return nRetValue;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */