vcl: Drop CmapResult indirection

Change-Id: I3b1beb5e976a255ef8ecdf8670b1e59547ec5ea4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139700
Tested-by: Jenkins
Reviewed-by: خالد حسني <khaled@aliftype.com>

1 files changed, 2 insertions, 15 deletions

diff --git a/include/vcl/fontcharmap.hxx b/include/vcl/fontcharmap.hxx
index d79ffce7be92..f7bea49f0f7a 100644
--- a/include/vcl/fontcharmap.hxx
+++ b/include/vcl/fontcharmap.hxx
@@ -25,7 +25,6 @@
 #include <tools/ref.hxx>
 
 class ImplFontCharMap;
-class CmapResult;
 class FontCharMap;
 class OutputDevice;
 
@@ -40,9 +39,9 @@ public:
      **/
     FontCharMap();
 
-    /** A new FontCharMap is created based on the CmapResult
+    /** A new FontCharMap is created based on passed arguments.
      */
-    FontCharMap( const CmapResult& rCR );
+    FontCharMap(bool bSymbolic, const sal_UCS4* pRangeCodes, int nRangeCount);
 
     virtual ~FontCharMap() override;
 
@@ -154,18 +153,6 @@ private:
     void                operator=( const FontCharMap& ) = delete;
 };
 
-// CmapResult is a normalized version of the many CMAP formats
-class VCL_PLUGIN_PUBLIC CmapResult
-{
-public:
-    explicit            CmapResult( bool bSymbolic = false,
-                            const sal_UCS4* pRangeCodes = nullptr, int nRangeCount = 0 );
-
-    const sal_UCS4*     mpRangeCodes;
-    int                 mnRangeCount;
-    bool                mbSymbolic;
-};
-
 #endif // INCLUDED_FONTCHARMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */