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

[Stephan Bergmann (via logerrit)]

 include/vcl/fontcharmap.hxx |    2 +-
 include/vcl/metric.hxx      |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 2cd335a17aad9cc9c0800c415521f2b066c81807
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Sep 23 14:56:52 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Sep 23 17:49:24 2020 +0200

    Consolidate on a single sal_UCS4 declaration in vcl/vclenum.hxx
    
    Change-Id: I910dba4c4ec6151a08dbb4e679c394ebe8ea5261
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103249
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/vcl/fontcharmap.hxx b/include/vcl/fontcharmap.hxx
index f600c3e6849f..cdd18fcd633e 100644
--- a/include/vcl/fontcharmap.hxx
+++ b/include/vcl/fontcharmap.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_FONTCHARMAP_HXX
 
 #include <vcl/dllapi.h>
+#include <vcl/vclenum.hxx>
 #include <tools/ref.hxx>
 
 class ImplFontCharMap;
@@ -28,7 +29,6 @@ class CmapResult;
 class FontCharMap;
 class OutputDevice;
 
-typedef sal_uInt32 sal_UCS4;
 typedef tools::SvRef<ImplFontCharMap> ImplFontCharMapRef;
 typedef tools::SvRef<FontCharMap> FontCharMapRef;
 
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index 0eb584960c16..aa1e6943a10a 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -27,7 +27,6 @@
 
 class FontCharMap;
 
-typedef sal_uInt32 sal_UCS4;
 typedef tools::SvRef<FontCharMap> FontCharMapRef;
 
 class VCL_DLLPUBLIC FontMetric : public vcl::Font