odk/examples/cpp/Convertor/Convertor.cxx | 12 +-----------
odk/examples/cpp/Convertor/Makefile | 13 +++----------
2 files changed, 4 insertions(+), 21 deletions(-)
New commits:
commit 7a0d3ed55c5b6ebda129d66574d78168ca29135b
Author: Hossein <hoss...@libreoffice.org>
AuthorDate: Sun Nov 14 01:13:08 2021 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Nov 15 07:35:39 2021 +0100
Fixing the license statement for the Convertor C++ example
Fixing the license statement for the 'Convertor.cxx' and 'Makefile'
according to the '/TEMPLATE.SOURCECODE.HEADER'
This example was added in 83b529d88388c7c8e0563242a030063bd95c4bed
Change-Id: I654d641999aab6951ad21f84fd75e080bb709ec4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125128
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/odk/examples/cpp/Convertor/Convertor.cxx
b/odk/examples/cpp/Convertor/Convertor.cxx
index 7297c0eaeec5..765a28317409 100644
--- a/odk/examples/cpp/Convertor/Convertor.cxx
+++ b/odk/examples/cpp/Convertor/Convertor.cxx
@@ -1,20 +1,10 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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.
*
* 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 <iostream>
diff --git a/odk/examples/cpp/Convertor/Makefile
b/odk/examples/cpp/Convertor/Makefile
index 33d86ae6b844..32bec8f7deba 100644
--- a/odk/examples/cpp/Convertor/Makefile
+++ b/odk/examples/cpp/Convertor/Makefile
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column:
100 -*-
#
# This file is part of the LibreOffice project.
#
@@ -5,16 +6,6 @@
# 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 .
-#
# Builds the C++ Convertor example of the SDK.
@@ -88,3 +79,5 @@ clean :
-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_COMP_GEN))
-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_COMP_OBJ))
-$(DEL) $(subst \\,\,$(subst /,$(PS),$(OUT_BIN)/Convertor*))
+
+# vim: set noet sw=4 ts=4:
