[Libreoffice-commits] core.git: include/vcl vcl/Library_vcl.mk vcl/source

[Chris Sherlock (via logerrit)]

 include/vcl/rendercontext/ImplMapRes.hxx |   14 ++++++-------
 vcl/Library_vcl.mk                       |    1 
 vcl/source/rendercontext/ImplMapRes.cxx  |   33 -------------------------------
 3 files changed, 7 insertions(+), 41 deletions(-)

New commits:
commit 6f84a89afdb125551ac71c9ed68085588e934b05
Author:     Chris Sherlock <chris.sherlock79 at gmail.com>
AuthorDate: Tue Sep 28 21:15:57 2021 +1000
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Thu Sep 30 16:12:01 2021 +0200

    vcl: initialize variables in ImplMapRes declaration
    
    Change-Id: I379a555c8e148ba0294198fb5e12582f73a51554
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122771
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/include/vcl/rendercontext/ImplMapRes.hxx b/include/vcl/rendercontext/ImplMapRes.hxx
index 8b7ee842b3ac..7a88a15af955 100644
--- a/include/vcl/rendercontext/ImplMapRes.hxx
+++ b/include/vcl/rendercontext/ImplMapRes.hxx
@@ -23,14 +23,14 @@
 
 struct ImplMapRes
 {
-    ImplMapRes();
+    ImplMapRes() = default;
 
-    tools::Long mnMapOfsX; ///< Offset in X direction
-    tools::Long mnMapOfsY; ///< Offset in Y direction
-    tools::Long mnMapScNumX; ///< Scaling factor - numerator in X direction
-    tools::Long mnMapScNumY; ///< Scaling factor - numerator in Y direction
-    tools::Long mnMapScDenomX; ///< Scaling factor - denominator in X direction
-    tools::Long mnMapScDenomY; ///< Scaling factor - denominator in Y direction
+    tools::Long mnMapOfsX = 0; ///< Offset in X direction
+    tools::Long mnMapOfsY = 0; ///< Offset in Y direction
+    tools::Long mnMapScNumX = 1; ///< Scaling factor - numerator in X direction
+    tools::Long mnMapScNumY = 1; ///< Scaling factor - numerator in Y direction
+    tools::Long mnMapScDenomX = 1; ///< Scaling factor - denominator in X direction
+    tools::Long mnMapScDenomY = 1; ///< Scaling factor - denominator in Y direction
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index d67f87d3fb9b..abd645216ab4 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -96,7 +96,6 @@ $(eval $(call gb_Library_use_externals,vcl,\
 $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/rendercontext/drawmode \
     vcl/skia/SkiaHelper \
-    vcl/source/rendercontext/ImplMapRes \
     vcl/source/animate/Animation \
     vcl/source/animate/AnimationBitmap \
     vcl/source/cnttype/mcnttfactory \
diff --git a/vcl/source/rendercontext/ImplMapRes.cxx b/vcl/source/rendercontext/ImplMapRes.cxx
deleted file mode 100644
index 5224d4efbdbd..000000000000
--- a/vcl/source/rendercontext/ImplMapRes.cxx
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- 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 <vcl/rendercontext/ImplMapRes.hxx>
-
-ImplMapRes::ImplMapRes()
-    : mnMapOfsX(0)
-    , mnMapOfsY(0)
-    , mnMapScNumX(1)
-    , mnMapScNumY(1)
-    , mnMapScDenomX(1)
-    , mnMapScDenomY(1)
-
-{
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */