Merge remote-tracking branch 'origin/release/v5.1.0' into develop

2026-04-07 13:55:33 +08:00 · 2018-03-02 11:12:28 +03:00
parent 49aa15a751 ca9e385bbc
commit f0cd60b93c
4907 changed files with 5162 additions and 4962 deletions
--- a/DesktopEditor/raster/BgraFrame.cpp
+++ b/DesktopEditor/raster/BgraFrame.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/BgraFrame.h
+++ b/DesktopEditor/raster/BgraFrame.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/ImageFileFormatChecker.cpp
+++ b/DesktopEditor/raster/ImageFileFormatChecker.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/ImageFileFormatChecker.h
+++ b/DesktopEditor/raster/ImageFileFormatChecker.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Common/IOutputDevice.h
+++ b/DesktopEditor/raster/Metafile/Common/IOutputDevice.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Common/MetaFile.h
+++ b/DesktopEditor/raster/Metafile/Common/MetaFile.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Common/MetaFileClip.h
+++ b/DesktopEditor/raster/Metafile/Common/MetaFileClip.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Common/MetaFileObjects.h
+++ b/DesktopEditor/raster/Metafile/Common/MetaFileObjects.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Common/MetaFileRenderer.h
+++ b/DesktopEditor/raster/Metafile/Common/MetaFileRenderer.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Common/MetaFileTypes.cpp
+++ b/DesktopEditor/raster/Metafile/Common/MetaFileTypes.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Common/MetaFileTypes.h
+++ b/DesktopEditor/raster/Metafile/Common/MetaFileTypes.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Common/MetaFileUtils.cpp
+++ b/DesktopEditor/raster/Metafile/Common/MetaFileUtils.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Common/MetaFileUtils.h
+++ b/DesktopEditor/raster/Metafile/Common/MetaFileUtils.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Emf/EmfClip.cpp
+++ b/DesktopEditor/raster/Metafile/Emf/EmfClip.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Emf/EmfClip.h
+++ b/DesktopEditor/raster/Metafile/Emf/EmfClip.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Emf/EmfFile.cpp
+++ b/DesktopEditor/raster/Metafile/Emf/EmfFile.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Emf/EmfFile.h
+++ b/DesktopEditor/raster/Metafile/Emf/EmfFile.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Emf/EmfObjects.cpp
+++ b/DesktopEditor/raster/Metafile/Emf/EmfObjects.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Emf/EmfObjects.h
+++ b/DesktopEditor/raster/Metafile/Emf/EmfObjects.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Emf/EmfPath.cpp
+++ b/DesktopEditor/raster/Metafile/Emf/EmfPath.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Emf/EmfPath.h
+++ b/DesktopEditor/raster/Metafile/Emf/EmfPath.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Emf/EmfPlayer.cpp
+++ b/DesktopEditor/raster/Metafile/Emf/EmfPlayer.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Emf/EmfPlayer.h
+++ b/DesktopEditor/raster/Metafile/Emf/EmfPlayer.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Emf/EmfTypes.h
+++ b/DesktopEditor/raster/Metafile/Emf/EmfTypes.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/MetaFile.cpp
+++ b/DesktopEditor/raster/Metafile/MetaFile.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/MetaFile.h
+++ b/DesktopEditor/raster/Metafile/MetaFile.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/StarView/SvmClip.cpp
+++ b/DesktopEditor/raster/Metafile/StarView/SvmClip.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/StarView/SvmClip.h
+++ b/DesktopEditor/raster/Metafile/StarView/SvmClip.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/StarView/SvmEnums.h
+++ b/DesktopEditor/raster/Metafile/StarView/SvmEnums.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/StarView/SvmFile.cpp
+++ b/DesktopEditor/raster/Metafile/StarView/SvmFile.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/StarView/SvmFile.h
+++ b/DesktopEditor/raster/Metafile/StarView/SvmFile.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/StarView/SvmObjects.cpp
+++ b/DesktopEditor/raster/Metafile/StarView/SvmObjects.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/StarView/SvmObjects.h
+++ b/DesktopEditor/raster/Metafile/StarView/SvmObjects.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/StarView/SvmPlayer.cpp
+++ b/DesktopEditor/raster/Metafile/StarView/SvmPlayer.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/StarView/SvmPlayer.h
+++ b/DesktopEditor/raster/Metafile/StarView/SvmPlayer.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/TestMain.cpp
+++ b/DesktopEditor/raster/Metafile/TestMain.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Wmf/WmfClip.cpp
+++ b/DesktopEditor/raster/Metafile/Wmf/WmfClip.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Wmf/WmfClip.h
+++ b/DesktopEditor/raster/Metafile/Wmf/WmfClip.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Wmf/WmfFile.h
+++ b/DesktopEditor/raster/Metafile/Wmf/WmfFile.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Wmf/WmfObjects.cpp
+++ b/DesktopEditor/raster/Metafile/Wmf/WmfObjects.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Wmf/WmfObjects.h
+++ b/DesktopEditor/raster/Metafile/Wmf/WmfObjects.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Wmf/WmfPlayer.cpp
+++ b/DesktopEditor/raster/Metafile/Wmf/WmfPlayer.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Wmf/WmfPlayer.h
+++ b/DesktopEditor/raster/Metafile/Wmf/WmfPlayer.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/Wmf/WmfTypes.h
+++ b/DesktopEditor/raster/Metafile/Wmf/WmfTypes.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/stdafx.cpp
+++ b/DesktopEditor/raster/Metafile/stdafx.cpp
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)
--- a/DesktopEditor/raster/Metafile/stdafx.h
+++ b/DesktopEditor/raster/Metafile/stdafx.h
@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2017
+ * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License (AGPL)