[Libreoffice-commits] core.git: cui/source include/vcl sc/source starmath/source svtools/source svx/source vcl/generic vcl/headless vcl/inc vcl/qa vcl/quartz vcl/source vcl/unx vcl/win
Chris Sherlock
chris.sherlock79 at gmail.com
Sun Jan 3 22:26:57 PST 2016
cui/source/dialogs/cuicharmap.cxx | 1
include/vcl/fontcharmap.hxx | 169 ++++++++++++++++++++++++++++++++
include/vcl/metric.hxx | 161 ------------------------------
include/vcl/textrectinfo.hxx | 57 ++++++++++
sc/source/filter/excel/xistyle.cxx | 1
starmath/source/dialog.cxx | 1
svtools/source/misc/sampletext.cxx | 1
svx/source/dialog/charmap.cxx | 1
vcl/generic/fontmanager/fontmanager.cxx | 1
vcl/generic/glyphs/gcach_ftyp.cxx | 3
vcl/generic/print/genpspgraphics.cxx | 1
vcl/headless/svptext.cxx | 1
vcl/inc/win/salgdi.h | 1
vcl/qa/cppunit/fontcharmap.cxx | 2
vcl/quartz/salgdi.cxx | 1
vcl/source/filter/wmf/wmfwr.cxx | 1
vcl/source/gdi/impfont.cxx | 2
vcl/source/outdev/font.cxx | 1
vcl/source/outdev/text.cxx | 1
vcl/source/window/brdwin.cxx | 1
vcl/source/window/msgbox.cxx | 1
vcl/unx/generic/gdi/cairotextrender.cxx | 1
vcl/unx/generic/gdi/salgdi3.cxx | 1
vcl/win/gdi/salfont.cxx | 1
24 files changed, 249 insertions(+), 163 deletions(-)
New commits:
commit 21f152a52397bf99364e5dc5ba9519e11452f260
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Mon Jan 4 16:06:13 2016 +1100
vcl: split classes out of metric.hxx
Change-Id: Id3b155abec7b7a2ff43d0a35e98709f5ee51c6b9
Reviewed-on: https://gerrit.libreoffice.org/21069
Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79 at gmail.com>
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 62346d8..ee26bca 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -31,6 +31,7 @@
#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
+#include <vcl/fontcharmap.hxx>
#include <svl/stritem.hxx>
#include <cuires.hrc>
diff --git a/include/vcl/fontcharmap.hxx b/include/vcl/fontcharmap.hxx
new file mode 100644
index 0000000..c4d495c
--- /dev/null
+++ b/include/vcl/fontcharmap.hxx
@@ -0,0 +1,169 @@
+/* -*- 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_FONTCHARMAP_METRIC_HXX
+#define INCLUDED_FONTCHARMAP_METRIC_HXX
+
+#include <vcl/dllapi.h>
+#include <vcl/font.hxx>
+#include <vcl/outdev.hxx>
+
+#include <boost/intrusive_ptr.hpp>
+
+class ImplFontCharMap;
+class CmapResult;
+
+typedef sal_uInt32 sal_UCS4;
+typedef boost::intrusive_ptr< ImplFontCharMap > ImplFontCharMapPtr;
+typedef boost::intrusive_ptr< FontCharMap > FontCharMapPtr;
+
+class VCL_DLLPUBLIC FontCharMap
+{
+public:
+ /** A new FontCharMap is created based on a "default" map, which includes
+ all codepoints in the Unicode BMP range, including surrogates.
+ **/
+ FontCharMap();
+ FontCharMap( const CmapResult& rCR );
+ ~FontCharMap();
+
+ /** Get the default font character map
+
+ @returns the default font character map.
+ */
+ static FontCharMapPtr GetDefaultMap( bool bSymbols=false );
+
+ /** Determines if the font character map is the "default". The default map
+ includes all codepoints in the Unicode BMP range, including surrogates.
+
+ @returns true if default map, false if not default map.
+ */
+ bool IsDefaultMap() const;
+
+ /** Does the font character map include the UCS4 character?
+
+ @returns true if character exists in font character map, false is not.
+ */
+ bool HasChar( sal_UCS4 ) const;
+
+ /** Returns the number of chars supported by the font, which
+ are inside the unicode range from cMin to cMax (inclusive).
+
+ @param cMin Lowest codepoint in range to be counted
+ @param cMax Highest codepoitn in range to be counted
+
+ @returns number of characters in the font charmap between the two
+ codepoints.
+ */
+ int CountCharsInRange( sal_UCS4 cMin, sal_UCS4 cMax ) const;
+
+ /** Get the number of characters in the font character map.
+
+ @returns number of characters in the font character map.
+ */
+ int GetCharCount() const;
+
+ /** Get the first character in the font character map.
+
+ @returns first character in the font character map.
+ */
+ sal_UCS4 GetFirstChar() const;
+
+ /** Get the last character in the font character map.
+
+ @returns last character in the font character map.
+ */
+ sal_UCS4 GetLastChar() const;
+
+ /** Get the next character in the font character map. This is important
+ because character maps (e.g. the default map which holds the characters
+ in the BMP plane) can have discontiguous ranges.
+
+ @param cChar Character from which to find next character
+
+ @returns next character in the font character map.
+ */
+ sal_UCS4 GetNextChar( sal_UCS4 cChar ) const;
+
+ /** Get the previous character in the font character map. This is important
+ because character maps (e.g. the default map which holds the characters
+ in the BMP plane) can have discontiguous ranges.
+
+ @param cChar Character from which to find previous character
+
+ @returns previous character in the font character map.
+ */
+ sal_UCS4 GetPrevChar( sal_UCS4 cChar ) const;
+
+ /** Get the index of a particular character in the font character map. The
+ index is different from the codepoint, because font character maps can
+
+ determine the index.
+
+ @param cChar Character used to find index number
+
+ @returns Index of character in font character map.
+ */
+ int GetIndexFromChar( sal_UCS4 cChar ) const;
+
+ /** Get the character at a particular index in the font character map. The
+ index is different from the codepoint, because font character maps can
+
+ determine the character.
+
+ @param nCharIndex Index used to find the character
+
+ @returns Character in font character map.
+ */
+ sal_UCS4 GetCharFromIndex( int nCharIndex ) const;
+
+ int GetGlyphIndex( sal_UCS4 ) const;
+
+private:
+ ImplFontCharMapPtr mpImplFontCharMap;
+
+ friend class ::OutputDevice;
+ friend void intrusive_ptr_release(FontCharMap* pFontCharMap);
+ friend void intrusive_ptr_add_ref(FontCharMap* pFontCharMap);
+
+ int findRangeIndex( sal_uInt32 ) const;
+
+ FontCharMap( ImplFontCharMapPtr pIFCMap );
+
+ sal_uInt32 mnRefCount;
+
+ // prevent assignment and copy construction
+ FontCharMap( const FontCharMap& ) = delete;
+ void operator=( const FontCharMap& ) = delete;
+};
+
+inline void intrusive_ptr_add_ref(FontCharMap* pFontCharMap)
+{
+ ++pFontCharMap->mnRefCount;
+}
+
+inline void intrusive_ptr_release(FontCharMap* pFontCharMap)
+{
+ if (--pFontCharMap->mnRefCount == 0)
+ delete pFontCharMap;
+}
+
+#endif // INCLUDED_FONTCHARMAP_METRIC_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index 57e471c..28b582f 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -80,167 +80,6 @@ inline std::basic_ostream<charT, traits> & operator <<(
return stream;
}
-class VCL_DLLPUBLIC FontCharMap
-{
-public:
- /** A new FontCharMap is created based on a "default" map, which includes
- all codepoints in the Unicode BMP range, including surrogates.
- **/
- FontCharMap();
- FontCharMap( const CmapResult& rCR );
- ~FontCharMap();
-
- /** Get the default font character map
-
- @returns the default font character map.
- */
- static FontCharMapPtr GetDefaultMap( bool bSymbols=false );
-
- /** Determines if the font character map is the "default". The default map
- includes all codepoints in the Unicode BMP range, including surrogates.
-
- @returns true if default map, false if not default map.
- */
- bool IsDefaultMap() const;
-
- /** Does the font character map include the UCS4 character?
-
- @returns true if character exists in font character map, false is not.
- */
- bool HasChar( sal_UCS4 ) const;
-
- /** Returns the number of chars supported by the font, which
- are inside the unicode range from cMin to cMax (inclusive).
-
- @param cMin Lowest codepoint in range to be counted
- @param cMax Highest codepoitn in range to be counted
-
- @returns number of characters in the font charmap between the two
- codepoints.
- */
- int CountCharsInRange( sal_UCS4 cMin, sal_UCS4 cMax ) const;
-
- /** Get the number of characters in the font character map.
-
- @returns number of characters in the font character map.
- */
- int GetCharCount() const;
-
- /** Get the first character in the font character map.
-
- @returns first character in the font character map.
- */
- sal_UCS4 GetFirstChar() const;
-
- /** Get the last character in the font character map.
-
- @returns last character in the font character map.
- */
- sal_UCS4 GetLastChar() const;
-
- /** Get the next character in the font character map. This is important
- because character maps (e.g. the default map which holds the characters
- in the BMP plane) can have discontiguous ranges.
-
- @param cChar Character from which to find next character
-
- @returns next character in the font character map.
- */
- sal_UCS4 GetNextChar( sal_UCS4 cChar ) const;
-
- /** Get the previous character in the font character map. This is important
- because character maps (e.g. the default map which holds the characters
- in the BMP plane) can have discontiguous ranges.
-
- @param cChar Character from which to find previous character
-
- @returns previous character in the font character map.
- */
- sal_UCS4 GetPrevChar( sal_UCS4 cChar ) const;
-
- /** Get the index of a particular character in the font character map. The
- index is different from the codepoint, because font character maps can
-
- determine the index.
-
- @param cChar Character used to find index number
-
- @returns Index of character in font character map.
- */
- int GetIndexFromChar( sal_UCS4 cChar ) const;
-
- /** Get the character at a particular index in the font character map. The
- index is different from the codepoint, because font character maps can
-
- determine the character.
-
- @param nCharIndex Index used to find the character
-
- @returns Character in font character map.
- */
- sal_UCS4 GetCharFromIndex( int nCharIndex ) const;
-
- int GetGlyphIndex( sal_UCS4 ) const;
-
-private:
- ImplFontCharMapPtr mpImplFontCharMap;
-
- friend class ::OutputDevice;
- friend void intrusive_ptr_release(FontCharMap* pFontCharMap);
- friend void intrusive_ptr_add_ref(FontCharMap* pFontCharMap);
-
- int findRangeIndex( sal_uInt32 ) const;
-
- FontCharMap( ImplFontCharMapPtr pIFCMap );
-
- sal_uInt32 mnRefCount;
-
- // prevent assignment and copy construction
- FontCharMap( const FontCharMap& ) = delete;
- void operator=( const FontCharMap& ) = delete;
-};
-
-inline void intrusive_ptr_add_ref(FontCharMap* pFontCharMap)
-{
- ++pFontCharMap->mnRefCount;
-}
-
-inline void intrusive_ptr_release(FontCharMap* pFontCharMap)
-{
- if (--pFontCharMap->mnRefCount == 0)
- delete pFontCharMap;
-}
-
-class VCL_DLLPUBLIC TextRectInfo
-{
- friend class ::OutputDevice;
-
-private:
- long mnMaxWidth;
- sal_uInt16 mnLineCount;
- bool mbEllipsis;
-
-public:
- TextRectInfo();
-
- long GetMaxLineWidth() const { return mnMaxWidth; }
- bool IsEllipses() const { return mbEllipsis; }
-
- bool operator ==( const TextRectInfo& rInfo ) const
- { return ((mnMaxWidth == rInfo.mnMaxWidth) &&
- (mnLineCount == rInfo.mnLineCount) &&
- (mbEllipsis == rInfo.mbEllipsis)); }
- bool operator !=( const TextRectInfo& rInfo ) const
- { return !(TextRectInfo::operator==( rInfo )); }
-};
-
-inline TextRectInfo::TextRectInfo()
-{
- mnMaxWidth = 0;
- mnLineCount = 0;
- mbEllipsis = false;
-}
-
#endif // INCLUDED_VCL_METRIC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/textrectinfo.hxx b/include/vcl/textrectinfo.hxx
new file mode 100644
index 0000000..8b98e1a
--- /dev/null
+++ b/include/vcl/textrectinfo.hxx
@@ -0,0 +1,57 @@
+/* -*- 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_TEXTRECTINFO_HXX
+#define INCLUDED_VCL_TEXTRECTINFO_HXX
+
+#include <vcl/outdev.hxx>
+
+class VCL_DLLPUBLIC TextRectInfo
+{
+ friend class ::OutputDevice;
+
+private:
+ long mnMaxWidth;
+ sal_uInt16 mnLineCount;
+ bool mbEllipsis;
+
+public:
+ TextRectInfo();
+
+ long GetMaxLineWidth() const { return mnMaxWidth; }
+ bool IsEllipses() const { return mbEllipsis; }
+
+ bool operator ==( const TextRectInfo& rInfo ) const
+ { return ((mnMaxWidth == rInfo.mnMaxWidth) &&
+ (mnLineCount == rInfo.mnLineCount) &&
+ (mbEllipsis == rInfo.mbEllipsis)); }
+ bool operator !=( const TextRectInfo& rInfo ) const
+ { return !(TextRectInfo::operator==( rInfo )); }
+};
+
+inline TextRectInfo::TextRectInfo()
+{
+ mnMaxWidth = 0;
+ mnLineCount = 0;
+ mbEllipsis = false;
+}
+
+#endif // INCLUDED_VCL_TEXTRECTINFO_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index ad99a02..05c1516 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -43,6 +43,7 @@
#include <editeng/flstitem.hxx>
#include <editeng/justifyitem.hxx>
#include <sal/macros.h>
+#include <vcl/fontcharmap.hxx>
#include "document.hxx"
#include "docpool.hxx"
#include "attrib.hxx"
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 0a4ebfb..1b6b349 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -36,6 +36,7 @@
#include <vcl/waitobj.hxx>
#include <vcl/settings.hxx>
#include <vcl/wall.hxx>
+#include <vcl/fontcharmap.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/sfx.hrc>
#include <osl/diagnose.h>
diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx
index 54e62db..0315361 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -11,6 +11,7 @@
#include <vcl/outdev.hxx>
#include <vcl/virdev.hxx>
#include <vcl/metric.hxx>
+#include <vcl/fontcharmap.hxx>
#include <i18nutil/unicode.hxx>
// This should only be used when a commonly used font incorrectly declares its
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 5c34df4..d4fb271 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -22,6 +22,7 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
+#include <vcl/fontcharmap.hxx>
#include <svtools/colorcfg.hxx>
#include <rtl/textenc.h>
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index f8cbc7d..86dfab3 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -34,6 +34,7 @@
#include "vcl/strhelper.hxx"
#include "vcl/ppdparser.hxx"
#include <vcl/embeddedfontshelper.hxx>
+#include <vcl/fontcharmap.hxx>
#include "tools/urlobj.hxx"
#include "tools/stream.hxx"
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index fe15d11..686be00 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
+#include <vcl/fontcharmap.hxx>
+
#include "gcach_ftyp.hxx"
#include "vcl/svapp.hxx"
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index f892eca..096536a 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -40,6 +40,7 @@
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <vcl/sysdata.hxx>
+#include <vcl/fontcharmap.hxx>
#include <config_cairo_canvas.h>
#include "fontsubset.hxx"
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index 785461d..df156ed 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -18,6 +18,7 @@
*/
#include <sal/types.h>
+#include <vcl/fontcharmap.hxx>
#include <basegfx/range/b2ibox.hxx>
#include "headless/svpgdi.hxx"
#include <config_cairo_canvas.h>
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index b8b7d74..c58c17a 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -28,6 +28,7 @@
#include "PhysicalFontFace.hxx"
#include "impfont.hxx"
#include <vcl/fontcapabilities.hxx>
+#include <vcl/fontcharmap.hxx>
#include <memory>
#include <unordered_set>
diff --git a/vcl/qa/cppunit/fontcharmap.cxx b/vcl/qa/cppunit/fontcharmap.cxx
index 17923af..4453ffa 100644
--- a/vcl/qa/cppunit/fontcharmap.cxx
+++ b/vcl/qa/cppunit/fontcharmap.cxx
@@ -12,7 +12,7 @@
#include <osl/file.hxx>
#include <osl/process.h>
-#include <vcl/metric.hxx>
+#include <vcl/fontcharmap.hxx>
class VclFontCharMapTest : public test::BootstrapFixture
{
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index c36eacf..ca83b61 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -33,6 +33,7 @@
#include <rtl/strbuf.hxx>
#include <vcl/metric.hxx>
+#include <vcl/fontcharmap.hxx>
#include <vcl/svapp.hxx>
#include <vcl/sysdata.hxx>
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index dbb9ad3..73f0489 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -37,6 +37,7 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <memory>
+#include <vcl/fontcharmap.hxx>
// MS Windows defines
diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx
index e8c68fc..f99bed1 100644
--- a/vcl/source/gdi/impfont.cxx
+++ b/vcl/source/gdi/impfont.cxx
@@ -15,7 +15,7 @@
* 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/metric.hxx>
+#include <vcl/fontcharmap.hxx>
#include <outfont.hxx>
#include <impfont.hxx>
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index f328a4f..237cca2 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -26,6 +26,7 @@
#include <vcl/edit.hxx>
#include <vcl/settings.hxx>
#include <vcl/sysdata.hxx>
+#include <vcl/fontcharmap.hxx>
#include "sallayout.hxx"
#include "svdata.hxx"
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 6a04eb8..b396e53 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -32,6 +32,7 @@
#include <comphelper/processfactory.hxx>
+#include <vcl/textrectinfo.hxx>
#include <vcl/outdev.hxx>
#include <vcl/virdev.hxx>
#include <vcl/bmpacc.hxx>
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 1e27374..962bd8a 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -22,6 +22,7 @@
#include <brdwin.hxx>
#include <window.h>
+#include <vcl/textrectinfo.hxx>
#include <vcl/event.hxx>
#include <vcl/decoview.hxx>
#include <vcl/syswin.hxx>
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 6f84fbc..600a1a8 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -24,6 +24,7 @@
#include <brdwin.hxx>
#include <window.h>
+#include <vcl/textrectinfo.hxx>
#include <vcl/metric.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 419dc58..7727e12 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -23,6 +23,7 @@
#include <vcl/settings.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/fontcharmap.hxx>
#include "generic/printergfx.hxx"
#include "generic/genpspgraphics.h"
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 27e339a..ae63464 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -40,6 +40,7 @@
#include <vcl/printerinfomanager.hxx>
#include <vcl/svapp.hxx>
#include <vcl/metric.hxx>
+#include <vcl/fontcharmap.hxx>
#include "fontmanager.hxx"
#include "impfont.hxx"
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index dba8568..1f83835 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -40,6 +40,7 @@
#include <vcl/settings.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/metric.hxx>
+#include <vcl/fontcharmap.hxx>
#include "fontsubset.hxx"
#include "outdev.h"
More information about the Libreoffice-commits
mailing list