[Libreoffice-commits] core.git: vcl/inc

[Khaled Hosny]

 vcl/inc/fontsubset.hxx          |    2 +-
 vcl/inc/pch/precompiled_vcl.hxx |    1 -
 vcl/inc/salglyphid.hxx          |   27 ---------------------------
 vcl/inc/sallayout.hxx           |    4 ++--
 vcl/inc/unx/fontmanager.hxx     |    2 +-
 5 files changed, 4 insertions(+), 32 deletions(-)

New commits:
commit 2ed7c02478968852d7d39c2c4677f2ecf3441bc7
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sat Apr 21 20:15:03 2018 +0200

    Drop header that had just one typedef
    
    Move the typedef elsewhere.
    
    Change-Id: I7a91ffd5ed4d1f182d6d57c80eb5188892fa5ccd
    Reviewed-on: https://gerrit.libreoffice.org/53268
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Khaled Hosny <khaledhosny at eglug.org>

diff --git a/vcl/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx
index 7973061eafd8..66368b7cbcb9 100644
--- a/vcl/inc/fontsubset.hxx
+++ b/vcl/inc/fontsubset.hxx
@@ -24,7 +24,7 @@
 #include <tools/gen.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
-#include "salglyphid.hxx"
+#include "sallayout.hxx"
 
 namespace vcl { struct TrueTypeFont; }         ///< SFT's idea of a TTF font
 
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index d3ca3bf1e6f3..509a0493ffec 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -111,7 +111,6 @@
 #include <salframe.hxx>
 #include <salgdi.hxx>
 #include <salgdiimpl.hxx>
-#include <salglyphid.hxx>
 #include <salhelper/linkhelper.hxx>
 #include <salhelper/thread.hxx>
 #include <salimestatus.hxx>
diff --git a/vcl/inc/salglyphid.hxx b/vcl/inc/salglyphid.hxx
deleted file mode 100644
index 6f9550e50bca..000000000000
--- a/vcl/inc/salglyphid.hxx
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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 .
- */
-#ifndef INCLUDED_VCL_INC_SALGLYPHID_HXX
-#define INCLUDED_VCL_INC_SALGLYPHID_HXX
-
-typedef sal_uInt32 sal_GlyphId;
-
-
-#endif // INCLUDED_VCL_INC_SALGLYPHID_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 3e75b606fd75..ba9cd3bd08e9 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -32,8 +32,6 @@
 #include <vcl/vclenum.hxx> // for typedef sal_UCS4
 #include <vcl/devicecoordinate.hxx>
 
-#include "salglyphid.hxx"
-
 #define MAX_FALLBACK 16
 
 
@@ -251,6 +249,8 @@ private:
     bool            mbIncomplete;
 };
 
+typedef sal_uInt32 sal_GlyphId;
+
 struct GlyphItem
 {
     int     mnFlags;
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index 8b791722b4a8..8b2c70c25000 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -25,7 +25,7 @@
 #include <vcl/timer.hxx>
 #include <vcl/vclenum.hxx>
 #include <com/sun/star/lang/Locale.hpp>
-#include <salglyphid.hxx>
+#include <sallayout.hxx>
 #include <unx/fc_fontoptions.hxx>
 
 #include <list>