|
 |
2654e0 |
From 193b49763a03d63ba79db50c1fa0563ec0d6b0c3 Mon Sep 17 00:00:00 2001
|
|
|
2654e0 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
2654e0 |
Date: Wed, 29 Jan 2020 12:44:52 +0000
|
|
|
2654e0 |
Subject: [PATCH] replace boost::bimap in sdext pdfimport
|
|
|
2654e0 |
|
|
|
2654e0 |
Change-Id: Ie324a0b81931bbd427483878a87beeca455ada18
|
|
|
2654e0 |
---
|
|
|
2654e0 |
sdext/source/pdfimport/inc/pdfiprocessor.hxx | 12 ++++-------
|
|
|
2654e0 |
sdext/source/pdfimport/tree/pdfiprocessor.cxx | 21 +++++++++++--------
|
|
|
2654e0 |
2 files changed, 16 insertions(+), 17 deletions(-)
|
|
|
2654e0 |
|
|
|
2654e0 |
diff --git a/sdext/source/pdfimport/inc/pdfiprocessor.hxx b/sdext/source/pdfimport/inc/pdfiprocessor.hxx
|
|
|
2654e0 |
index 89f9d601b7b0..9e08d6a6a765 100644
|
|
|
2654e0 |
--- a/sdext/source/pdfimport/inc/pdfiprocessor.hxx
|
|
|
2654e0 |
+++ b/sdext/source/pdfimport/inc/pdfiprocessor.hxx
|
|
|
2654e0 |
@@ -37,9 +37,6 @@
|
|
|
2654e0 |
#include "treevisitorfactory.hxx"
|
|
|
2654e0 |
#include "genericelements.hxx"
|
|
|
2654e0 |
|
|
|
2654e0 |
-#include <boost/bimap/bimap.hpp>
|
|
|
2654e0 |
-#include <boost/bimap/unordered_set_of.hpp>
|
|
|
2654e0 |
-
|
|
|
2654e0 |
namespace pdfi
|
|
|
2654e0 |
{
|
|
|
2654e0 |
|
|
|
2654e0 |
@@ -160,10 +157,8 @@ namespace pdfi
|
|
|
2654e0 |
typedef std::unordered_map<sal_Int32,FontAttributes> IdToFontMap;
|
|
|
2654e0 |
typedef std::unordered_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap;
|
|
|
2654e0 |
|
|
|
2654e0 |
- typedef boost::bimaps::bimap<
|
|
|
2654e0 |
- boost::bimaps::unordered_set_of<GraphicsContext, GraphicsContextHash>,
|
|
|
2654e0 |
- boost::bimaps::unordered_set_of<sal_Int32>
|
|
|
2654e0 |
- > GCToIdBiMap;
|
|
|
2654e0 |
+ typedef std::unordered_map<sal_Int32,GraphicsContext> IdToGCMap;
|
|
|
2654e0 |
+ typedef std::unordered_map<GraphicsContext, sal_Int32, GraphicsContextHash> GCToIdMap;
|
|
|
2654e0 |
|
|
|
2654e0 |
typedef std::vector<GraphicsContext> GraphicsContextStack;
|
|
|
2654e0 |
|
|
|
2654e0 |
@@ -178,7 +173,8 @@ namespace pdfi
|
|
|
2654e0 |
|
|
|
2654e0 |
GraphicsContextStack m_aGCStack;
|
|
|
2654e0 |
sal_Int32 m_nNextGCId;
|
|
|
2654e0 |
- GCToIdBiMap m_aGCToId;
|
|
|
2654e0 |
+ IdToGCMap m_aIdToGC;
|
|
|
2654e0 |
+ GCToIdMap m_aGCToId;
|
|
|
2654e0 |
|
|
|
2654e0 |
ImageContainer m_aImages;
|
|
|
2654e0 |
|
|
|
2654e0 |
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
|
|
|
2654e0 |
index c6baa7fee8b2..ed2eaf6510b9 100644
|
|
|
2654e0 |
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
|
|
|
2654e0 |
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
|
|
|
2654e0 |
@@ -54,6 +54,7 @@ namespace pdfi
|
|
|
2654e0 |
m_aFontToId(),
|
|
|
2654e0 |
m_aGCStack(),
|
|
|
2654e0 |
m_nNextGCId( 1 ),
|
|
|
2654e0 |
+ m_aIdToGC(),
|
|
|
2654e0 |
m_aGCToId(),
|
|
|
2654e0 |
m_aImages(),
|
|
|
2654e0 |
m_nPages(0),
|
|
|
2654e0 |
@@ -65,12 +66,13 @@ namespace pdfi
|
|
|
2654e0 |
aDefFont.isBold = false;
|
|
|
2654e0 |
aDefFont.isItalic = false;
|
|
|
2654e0 |
aDefFont.size = 10*PDFI_OUTDEV_RESOLUTION/72;
|
|
|
2654e0 |
- m_aIdToFont[ 0 ] = aDefFont;
|
|
|
2654e0 |
- m_aFontToId[ aDefFont ] = 0;
|
|
|
2654e0 |
+ m_aIdToFont.insert({0, aDefFont});
|
|
|
2654e0 |
+ m_aFontToId.insert({aDefFont, 0});
|
|
|
2654e0 |
|
|
|
2654e0 |
GraphicsContext aDefGC;
|
|
|
2654e0 |
m_aGCStack.push_back( aDefGC );
|
|
|
2654e0 |
- m_aGCToId.insert(GCToIdBiMap::relation(aDefGC, 0));
|
|
|
2654e0 |
+ m_aGCToId.insert({aDefGC, 0});
|
|
|
2654e0 |
+ m_aIdToGC.insert({0, aDefGC});
|
|
|
2654e0 |
}
|
|
|
2654e0 |
|
|
|
2654e0 |
void PDFIProcessor::setPageNum( sal_Int32 nPages )
|
|
|
2654e0 |
@@ -468,12 +470,13 @@ const FontAttributes& PDFIProcessor::getFont( sal_Int32 nFontId ) const
|
|
|
2654e0 |
sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC )
|
|
|
2654e0 |
{
|
|
|
2654e0 |
sal_Int32 nGCId = 0;
|
|
|
2654e0 |
- auto it = m_aGCToId.left.find( rGC );
|
|
|
2654e0 |
- if( it != m_aGCToId.left.end() )
|
|
|
2654e0 |
+ auto it = m_aGCToId.find( rGC );
|
|
|
2654e0 |
+ if( it != m_aGCToId.end() )
|
|
|
2654e0 |
nGCId = it->second;
|
|
|
2654e0 |
else
|
|
|
2654e0 |
{
|
|
|
2654e0 |
- m_aGCToId.insert(GCToIdBiMap::relation(rGC, m_nNextGCId));
|
|
|
2654e0 |
+ m_aGCToId.insert({rGC, m_nNextGCId});
|
|
|
2654e0 |
+ m_aIdToGC.insert({m_nNextGCId, rGC});
|
|
|
2654e0 |
nGCId = m_nNextGCId;
|
|
|
2654e0 |
m_nNextGCId++;
|
|
|
2654e0 |
}
|
|
|
2654e0 |
@@ -483,9 +486,9 @@ sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC )
|
|
|
2654e0 |
|
|
|
2654e0 |
const GraphicsContext& PDFIProcessor::getGraphicsContext( sal_Int32 nGCId ) const
|
|
|
2654e0 |
{
|
|
|
2654e0 |
- auto it = m_aGCToId.right.find( nGCId );
|
|
|
2654e0 |
- if( it == m_aGCToId.right.end() )
|
|
|
2654e0 |
- it = m_aGCToId.right.find( 0 );
|
|
|
2654e0 |
+ auto it = m_aIdToGC.find( nGCId );
|
|
|
2654e0 |
+ if( it == m_aIdToGC.end() )
|
|
|
2654e0 |
+ it = m_aIdToGC.find( 0 );
|
|
|
2654e0 |
return it->second;
|
|
|
2654e0 |
}
|
|
|
2654e0 |
|
|
|
2654e0 |
--
|
|
|
2654e0 |
2.24.1
|
|
|
2654e0 |
|