summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/PhysicalFontCollection.hxx2
-rw-r--r--vcl/inc/cupsmgr.hxx12
-rw-r--r--vcl/inc/fontcache.hxx6
-rw-r--r--vcl/inc/fontmanager.hxx38
-rw-r--r--vcl/inc/generic/glyphcache.hxx9
-rw-r--r--vcl/inc/generic/printergfx.hxx1
-rw-r--r--vcl/inc/headless/svpinst.hxx1
-rw-r--r--vcl/inc/image.h4
-rw-r--r--vcl/inc/impimagetree.hxx9
-rw-r--r--vcl/inc/jobset.h4
-rw-r--r--vcl/inc/opengl/program.hxx4
-rw-r--r--vcl/inc/outdev.h2
-rw-r--r--vcl/inc/outfont.hxx4
-rw-r--r--vcl/inc/print.h4
-rw-r--r--vcl/inc/svdata.hxx4
-rw-r--r--vcl/inc/unx/saldisp.hxx6
-rw-r--r--vcl/inc/unx/salinst.h2
17 files changed, 56 insertions, 56 deletions
diff --git a/vcl/inc/PhysicalFontCollection.hxx b/vcl/inc/PhysicalFontCollection.hxx
index 86488fcebef5..28e18071ddb3 100644
--- a/vcl/inc/PhysicalFontCollection.hxx
+++ b/vcl/inc/PhysicalFontCollection.hxx
@@ -37,7 +37,7 @@ private:
mutable bool mbMatchData; // true if matching attributes are initialized
bool mbMapNames; // true if MapNames are available
- typedef boost::unordered_map<const OUString, PhysicalFontFamily*,OUStringHash> PhysicalFontFamilies;
+ typedef std::unordered_map<const OUString, PhysicalFontFamily*,OUStringHash> PhysicalFontFamilies;
PhysicalFontFamilies maPhysicalFontFamilies;
ImplPreMatchFontSubstitution* mpPreMatchHook; // device specific prematch substitution
diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx
index 12beba4d365c..c7b948737f05 100644
--- a/vcl/inc/cupsmgr.hxx
+++ b/vcl/inc/cupsmgr.hxx
@@ -38,13 +38,13 @@ struct FPtrHash
class CUPSManager : public PrinterInfoManager
{
- boost::unordered_map< FILE*, OString, FPtrHash > m_aSpoolFiles;
- int m_nDests;
- void* m_pDests;
- bool m_bNewDests;
- boost::unordered_map< OUString, int, OUStringHash > m_aCUPSDestMap;
+ std::unordered_map< FILE*, OString, FPtrHash > m_aSpoolFiles;
+ int m_nDests;
+ void* m_pDests;
+ bool m_bNewDests;
+ std::unordered_map< OUString, int, OUStringHash > m_aCUPSDestMap;
- boost::unordered_map< OUString, PPDContext, OUStringHash > m_aDefaultContexts;
+ std::unordered_map< OUString, PPDContext, OUStringHash > m_aDefaultContexts;
OString m_aUser;
/** this is a security risk, but the CUPS API demands
diff --git a/vcl/inc/fontcache.hxx b/vcl/inc/fontcache.hxx
index 777c896face3..98d9029b6be9 100644
--- a/vcl/inc/fontcache.hxx
+++ b/vcl/inc/fontcache.hxx
@@ -22,7 +22,7 @@
#include <rtl/ustring.hxx>
#include <vcl/dllapi.h>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include "fontmanager.hxx"
@@ -42,7 +42,7 @@ class VCL_PLUGIN_PUBLIC FontCache
FontCacheEntry m_aEntry;
};
- typedef boost::unordered_map< OString, FontFile, OStringHash > FontDirMap;
+ typedef std::unordered_map< OString, FontFile, OStringHash > FontDirMap;
struct FontDir
{
sal_Int64 m_nTimestamp;
@@ -53,7 +53,7 @@ class VCL_PLUGIN_PUBLIC FontCache
FontDir() : m_nTimestamp(0), m_bNoFiles(false), m_bUserOverrideOnly( false ) {}
};
- typedef boost::unordered_map< int, FontDir > FontCacheData;
+ typedef std::unordered_map< int, FontDir > FontCacheData;
FontCacheData m_aCache;
OUString m_aCacheFile;
bool m_bDoFlush;
diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx
index e1203bd83a90..beec12ad838f 100644
--- a/vcl/inc/fontmanager.hxx
+++ b/vcl/inc/fontmanager.hxx
@@ -20,10 +20,10 @@
#ifndef INCLUDED_VCL_INC_FONTMANAGER_HXX
#define INCLUDED_VCL_INC_FONTMANAGER_HXX
-#include <boost/unordered_map.hpp>
-#include <map>
#include <list>
+#include <map>
#include <set>
+#include <unordered_map>
#include <vcl/dllapi.h>
#include <vcl/helper.hxx>
@@ -155,7 +155,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
// upper byte contains: 0 for horizontal metric
// 1 for vertical metric
// highest byte: 0 for now
- boost::unordered_map< int, CharacterMetric > m_aMetrics;
+ std::unordered_map< int, CharacterMetric > m_aMetrics;
// contains the unicode blocks for which metrics were queried
// this implies that metrics should be queried in terms of
// unicode blocks. here a unicode block is identified
@@ -167,7 +167,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
// a single pass, then all bits should be set
char m_aPages[32];
- boost::unordered_map< sal_Unicode, bool > m_bVerticalSubstitutions;
+ std::unordered_map< sal_Unicode, bool > m_bVerticalSubstitutions;
PrintFontMetrics() {}
@@ -239,27 +239,27 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
};
fontID m_nNextFontID;
- boost::unordered_map< fontID, PrintFont* > m_aFonts;
- boost::unordered_map< int, FontFamily > m_aFamilyTypes;
+ std::unordered_map< fontID, PrintFont* > m_aFonts;
+ std::unordered_map< int, FontFamily > m_aFamilyTypes;
std::list< OUString > m_aPrinterDrivers;
std::list< OString > m_aFontDirectories;
std::list< int > m_aPrivateFontDirectories;
utl::MultiAtomProvider* m_pAtoms;
// for speeding up findFontFileID
- boost::unordered_map< OString, std::set< fontID >, OStringHash >
+ std::unordered_map< OString, std::set< fontID >, OStringHash >
m_aFontFileToFontID;
- boost::unordered_map< OString, int, OStringHash >
+ std::unordered_map< OString, int, OStringHash >
m_aDirToAtom;
- boost::unordered_map< int, OString > m_aAtomToDir;
+ std::unordered_map< int, OString > m_aAtomToDir;
int m_nNextDirAtom;
- boost::unordered_multimap< OString, sal_Unicode, OStringHash >
+ std::unordered_multimap< OString, sal_Unicode, OStringHash >
m_aAdobenameToUnicode;
- boost::unordered_multimap< sal_Unicode, OString >
+ std::unordered_multimap< sal_Unicode, OString >
m_aUnicodeToAdobename;
- boost::unordered_multimap< sal_Unicode, sal_uInt8 > m_aUnicodeToAdobecode;
- boost::unordered_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode;
+ std::unordered_multimap< sal_Unicode, sal_uInt8 > m_aUnicodeToAdobecode;
+ std::unordered_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode;
mutable FontCache* m_pFontCache;
@@ -286,7 +286,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
PrintFont* getFont( fontID nID ) const
{
- boost::unordered_map< fontID, PrintFont* >::const_iterator it;
+ std::unordered_map< fontID, PrintFont* >::const_iterator it;
it = m_aFonts.find( nID );
return it == m_aFonts.end() ? NULL : it->second;
}
@@ -301,7 +301,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
called from <code>initialize()</code>
*/
void initFontconfig();
- void countFontconfigFonts( boost::unordered_map<OString, int, OStringHash>& o_rVisitedPaths );
+ void countFontconfigFonts( std::unordered_map<OString, int, OStringHash>& o_rVisitedPaths );
/* deinitialize fontconfig
*/
void deinitFontconfig();
@@ -447,15 +447,15 @@ public:
// helper for type 1 fonts
std::list< OString > getAdobeNameFromUnicode( sal_Unicode aChar ) const;
- std::pair< boost::unordered_multimap< sal_Unicode, sal_uInt8 >::const_iterator,
- boost::unordered_multimap< sal_Unicode, sal_uInt8 >::const_iterator >
+ std::pair< std::unordered_multimap< sal_Unicode, sal_uInt8 >::const_iterator,
+ std::unordered_multimap< sal_Unicode, sal_uInt8 >::const_iterator >
getAdobeCodeFromUnicode( sal_Unicode aChar ) const
{
return m_aUnicodeToAdobecode.equal_range( aChar );
}
std::list< sal_Unicode > getUnicodeFromAdobeName( const OString& rName ) const;
- std::pair< boost::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator,
- boost::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator >
+ std::pair< std::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator,
+ std::unordered_multimap< sal_uInt8, sal_Unicode >::const_iterator >
getUnicodeFromAdobeCode( sal_uInt8 aChar ) const
{
return m_aAdobecodeToUnicode.equal_range( aChar );
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index ddfc7a8ef965..4133cd8689d8 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -27,7 +27,6 @@
#include FT_GLYPH_H
#include <boost/shared_ptr.hpp>
-#include <boost/unordered_map.hpp>
#include <basebmp/bitmapdevice.hxx>
#include <com/sun/star/i18n/XBreakIterator.hpp>
@@ -38,6 +37,8 @@
#include <outfont.hxx>
#include <sallayout.hxx>
+#include <unordered_map>
+
class FtFontInfo;
class GlyphCachePeer;
class GlyphData;
@@ -87,7 +88,7 @@ private:
// the FontList key's mpFontData member is reinterpreted as integer font id
struct IFSD_Equal{ bool operator()( const FontSelectPattern&, const FontSelectPattern& ) const; };
struct IFSD_Hash{ size_t operator()( const FontSelectPattern& ) const; };
- typedef ::boost::unordered_map<FontSelectPattern,ServerFont*,IFSD_Hash,IFSD_Equal > FontList;
+ typedef std::unordered_map<FontSelectPattern,ServerFont*,IFSD_Hash,IFSD_Equal > FontList;
FontList maFontList;
sal_uLong mnMaxSize; // max overall cache size in bytes
mutable sal_uLong mnBytesUsed;
@@ -221,7 +222,7 @@ private:
ServerFontLayoutEngine* GetLayoutEngine();
- typedef ::boost::unordered_map<int,GlyphData> GlyphList;
+ typedef std::unordered_map<int,GlyphData> GlyphList;
mutable GlyphList maGlyphList;
const FontSelectPattern maFontSelData;
@@ -256,7 +257,7 @@ private:
bool mbArtBold;
bool mbUseGamma;
- typedef ::boost::unordered_map<int,int> GlyphSubstitution;
+ typedef std::unordered_map<int,int> GlyphSubstitution;
GlyphSubstitution maGlyphSubstitution;
ServerFontLayoutEngine* mpLayoutEngine;
diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx
index a0e2683ce6b2..aa7f87ce4876 100644
--- a/vcl/inc/generic/printergfx.hxx
+++ b/vcl/inc/generic/printergfx.hxx
@@ -27,7 +27,6 @@
#include "vclpluginapi.h"
#include <list>
-#include <boost/unordered_map.hpp>
namespace psp {
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 0bf542fccd2b..2e2d8339c7f8 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -30,6 +30,7 @@
#include <basebmp/scanlineformats.hxx>
#include <list>
+#include <map>
#include <time.h>
diff --git a/vcl/inc/image.h b/vcl/inc/image.h
index d9de98caa13f..b9767ce0362c 100644
--- a/vcl/inc/image.h
+++ b/vcl/inc/image.h
@@ -22,7 +22,7 @@
#include <vcl/bitmapex.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
// - ImplImageBmp -
@@ -81,7 +81,7 @@ struct ImageAryData
struct ImplImageList
{
typedef std::vector<ImageAryData *> ImageAryDataVec;
- typedef boost::unordered_map< OUString, ImageAryData *, OUStringHash >
+ typedef std::unordered_map< OUString, ImageAryData *, OUStringHash >
ImageAryDataNameHash;
ImageAryDataVec maImages;
diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx
index e66e754a1c8d..0fbb2769e086 100644
--- a/vcl/inc/impimagetree.hxx
+++ b/vcl/inc/impimagetree.hxx
@@ -22,10 +22,9 @@
#include "sal/config.h"
+#include <unordered_map>
#include <vector>
-#include <boost/unordered_map.hpp>
-
#include "boost/noncopyable.hpp"
#include "com/sun/star/uno/Reference.hxx"
#include "rtl/ustring.hxx"
@@ -58,8 +57,8 @@ public:
css::uno::Reference< css::container::XNameAccess > getNameAccess();
private:
- typedef boost::unordered_map<OUString, std::pair<bool, BitmapEx>, OUStringHash> IconCache;
- typedef boost::unordered_map<OUString, OUString, OUStringHash> IconLinkHash;
+ typedef std::unordered_map<OUString, std::pair<bool, BitmapEx>, OUStringHash> IconCache;
+ typedef std::unordered_map<OUString, OUString, OUStringHash> IconLinkHash;
struct IconSet {
OUString maURL;
@@ -72,7 +71,7 @@ private:
};
/// Map between the theme name(s) and the content.
- typedef boost::unordered_map<OUString, IconSet, OUStringHash> StyleIconSet;
+ typedef std::unordered_map<OUString, IconSet, OUStringHash> StyleIconSet;
/// Remember all the (used) icon styles and individual icons in them.
StyleIconSet maIconSet;
diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h
index c62440773d57..e1ba5bbe629e 100644
--- a/vcl/inc/jobset.h
+++ b/vcl/inc/jobset.h
@@ -20,9 +20,9 @@
#ifndef INCLUDED_VCL_INC_JOBSET_H
#define INCLUDED_VCL_INC_JOBSET_H
-#include <boost/unordered_map.hpp>
#include <rtl/ustring.hxx>
#include <vcl/prntypes.hxx>
+#include <unordered_map>
// see com.sun.star.portal.client.JobSetupSystem.idl:
#define JOBSETUP_SYSTEM_DONTKNOW 0
@@ -46,7 +46,7 @@ struct ImplJobSetup
long mnPaperHeight; // paper height (100th mm)
sal_uIntPtr mnDriverDataLen; // length of system specific data
sal_uInt8* mpDriverData; // system specific data (will be streamed a byte block)
- ::boost::unordered_map< OUString, OUString, OUStringHash > maValueMap;
+ std::unordered_map< OUString, OUString, OUStringHash > maValueMap;
ImplJobSetup();
ImplJobSetup( const ImplJobSetup& rJobSetup );
diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx
index 996bc61b275c..6e21abfd1129 100644
--- a/vcl/inc/opengl/program.hxx
+++ b/vcl/inc/opengl/program.hxx
@@ -22,9 +22,9 @@
#include <tools/color.hxx>
#include <opengl/texture.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
-typedef boost::unordered_map< OString, GLuint, OStringHash > UniformCache;
+typedef std::unordered_map< OString, GLuint, OStringHash > UniformCache;
typedef std::list< OpenGLTexture > TextureList;
class VCL_PLUGIN_PUBLIC OpenGLProgram
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index c878d8b2590d..bcb64f23dde1 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -140,7 +140,7 @@ private:
// cache of recently used font instances
struct IFSD_Equal { bool operator()( const FontSelectPattern&, const FontSelectPattern& ) const; };
struct IFSD_Hash { size_t operator()( const FontSelectPattern& ) const; };
- typedef ::boost::unordered_map<FontSelectPattern,ImplFontEntry*,IFSD_Hash,IFSD_Equal > FontInstanceList;
+ typedef std::unordered_map<FontSelectPattern,ImplFontEntry*,IFSD_Hash,IFSD_Equal > FontInstanceList;
FontInstanceList maFontInstanceList;
public:
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 0f28657aed0d..69de06ac1cf9 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -28,7 +28,7 @@
#include <unotools/fontdefs.hxx>
#include <vcl/vclenum.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
class PhysicalFontFace;
class PhysicalFontFamily;
@@ -246,7 +246,7 @@ private:
// TODO: at least the ones which just differ in orientation, stretching or height
typedef ::std::pair<sal_UCS4,FontWeight> GFBCacheKey;
struct GFBCacheKey_Hash{ size_t operator()( const GFBCacheKey& ) const; };
- typedef ::boost::unordered_map<GFBCacheKey,OUString,GFBCacheKey_Hash> UnicodeFallbackList;
+ typedef ::std::unordered_map<GFBCacheKey,OUString,GFBCacheKey_Hash> UnicodeFallbackList;
UnicodeFallbackList* mpUnicodeFallbackList;
};
diff --git a/vcl/inc/print.h b/vcl/inc/print.h
index 2aa3c6b4a370..7eec4216eb63 100644
--- a/vcl/inc/print.h
+++ b/vcl/inc/print.h
@@ -23,7 +23,7 @@
#include "rtl/ustring.hxx"
#include "vcl/dllapi.h"
#include <vector>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
struct SalPrinterQueueInfo;
class QueueInfo;
@@ -41,7 +41,7 @@ struct ImplPrnQueueData
class VCL_PLUGIN_PUBLIC ImplPrnQueueList
{
public:
- boost::unordered_map< OUString, sal_Int32, OUStringHash >
+ std::unordered_map< OUString, sal_Int32, OUStringHash >
m_aNameToIndex;
std::vector< ImplPrnQueueData > m_aQueueInfos;
std::vector< OUString > m_aPrinterList;
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 683f40d908fb..9d20196d07b5 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -43,7 +43,7 @@
#include "com/sun/star/lang/XComponent.hpp"
#include "com/sun/star/uno/Reference.hxx"
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <config_version.h>
@@ -336,7 +336,7 @@ struct ImplSVData
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxAccessBridge;
::vcl::SettingsConfigItem* mpSettingsConfigItem;
std::list< vcl::DeleteOnDeinitBase* >* mpDeinitDeleteList;
- boost::unordered_map< int, OUString >* mpPaperNames;
+ std::unordered_map< int, OUString >* mpPaperNames;
Link maDeInitHook;
};
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 8b56e18c0924..acaa1fd7065a 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -31,9 +31,9 @@ class SalXLib;
#include <vcl/ptrstyle.hxx>
#include <sal/types.h>
#include <osl/mutex.h>
-#include <vector>
#include <list>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
+#include <vector>
#include <tools/gen.hxx>
#include <salwtype.hxx>
#include <generic/gendata.hxx>
@@ -204,7 +204,7 @@ public:
RenderEntry() : m_aPixmap( 0 ), m_aPicture( 0 ) {}
};
- typedef boost::unordered_map<int,RenderEntry> RenderEntryMap;
+ typedef std::unordered_map<int,RenderEntry> RenderEntryMap;
struct ScreenData
{
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index cea08dd6da96..c2df7a87f182 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -37,7 +37,7 @@ class SalXLib;
class VCLPLUG_GEN_PUBLIC X11SalInstance : public SalGenericInstance
{
private:
- boost::unordered_map< Atom, com::sun::star::uno::Reference< com::sun::star::datatransfer::clipboard::XClipboard > > m_aInstances;
+ std::unordered_map< Atom, com::sun::star::uno::Reference< com::sun::star::datatransfer::clipboard::XClipboard > > m_aInstances;
protected:
SalXLib *mpXLib;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 14:34:15 +0000