[Libreoffice-commits] core.git: 3 commits - accessibility/inc accessibility/source canvas/source chart2/source cui/source dbaccess/inc dbaccess/source desktop/inc desktop/source editeng/inc editeng/source filter/source forms/inc forms/source framework/inc framework/source helpcompiler/inc helpcompiler/source idlc/inc idlc/source include/basic include/codemaker include/filter include/framework include/oox include/sfx2 include/svl include/svtools include/svx include/toolkit include/tools include/unotools include/vbahelper include/vcl include/xmloff io/source l10ntools/inc l10ntools/source linguistic/source lotuswordpro/source oox/inc oox/source package/inc package/source pyuno/source registry/source reportdesign/source rsc/inc rsc/source sal/osl svl/inc svl/qa svl/source svtools/inc svtools/source svx/source testtools/source toolkit/source tools/inc tools/source ucbhelper/source unotools/inc unotools/source unoxml/source uui/source vbahelper/inc vbahelper/source vcl/generic vcl/inc vcl/opengl vcl/s ource vcl/unx writerfilter/inc writerfilter/source writerperfect/source xmlhelp/source xmloff/inc xmloff/source xmlscript/inc xmlscript/source
Caolán McNamara
caolanm at redhat.com
Fri Jan 2 08:15:15 PST 2015
accessibility/inc/pch/precompiled_acc.hxx | 1
accessibility/source/extended/textwindowaccessibility.cxx | 1
canvas/source/opengl/ogl_texturecache.hxx | 4
chart2/source/inc/DataSeriesHelper.hxx | 3
chart2/source/inc/PropertyHelper.hxx | 6
chart2/source/view/charttypes/VSeriesPlotter.cxx | 3
chart2/source/view/main/DummyXShape.hxx | 6
cui/source/customize/cfg.cxx | 14 --
cui/source/inc/macropg.hxx | 5
cui/source/inc/scriptdlg.hxx | 6
dbaccess/inc/pch/precompiled_dbu.hxx | 2
dbaccess/source/core/recovery/subcomponents.hxx | 6
dbaccess/source/ui/browser/genericcontroller.cxx | 4
desktop/inc/pch/precompiled_deployment.hxx | 4
desktop/source/app/dispatchwatcher.hxx | 4
desktop/source/deployment/inc/dp_persmap.h | 4
desktop/source/deployment/manager/dp_activepackages.cxx | 1
desktop/source/deployment/manager/dp_extensionmanager.cxx | 1
desktop/source/deployment/manager/dp_extensionmanager.hxx | 6
desktop/source/deployment/manager/dp_managerfac.cxx | 5
desktop/source/deployment/registry/component/dp_component.cxx | 10 -
desktop/source/deployment/registry/dp_registry.cxx | 12 -
desktop/source/deployment/registry/executable/dp_executable.cxx | 4
desktop/source/deployment/registry/inc/dp_backend.h | 4
desktop/source/migration/migration_impl.hxx | 10 -
editeng/inc/pch/precompiled_editeng.hxx | 2
editeng/source/editeng/impedit4.cxx | 6
editeng/source/misc/svxacorr.cxx | 4
editeng/source/uno/unoipset.cxx | 1
filter/source/config/cache/cacheitem.hxx | 18 +-
filter/source/config/cache/querytokenizer.hxx | 10 -
filter/source/msfilter/util.cxx | 6
filter/source/svg/gfxtypes.hxx | 9 -
filter/source/svg/svgfilter.hxx | 20 +--
filter/source/svg/svgreader.cxx | 1
filter/source/svg/svgwriter.hxx | 6
forms/inc/pch/precompiled_frm.hxx | 2
forms/source/component/DatabaseForm.cxx | 2
forms/source/component/Filter.hxx | 4
forms/source/inc/InterfaceContainer.hxx | 6
framework/inc/classes/filtercachedata.hxx | 23 +--
framework/inc/pch/precompiled_fwe.hxx | 2
framework/inc/pch/precompiled_fwk.hxx | 2
framework/inc/stdtypes.h | 14 +-
framework/inc/uiconfiguration/globalsettings.hxx | 10 -
framework/inc/uiconfiguration/imagemanager.hxx | 1
framework/inc/uiconfiguration/imagetype.hxx | 18 +-
framework/inc/uiconfiguration/moduleimagemanager.hxx | 12 -
framework/inc/uielement/menubarmanager.hxx | 2
framework/inc/uielement/menubarwrapper.hxx | 2
framework/inc/uielement/newmenucontroller.hxx | 4
framework/inc/uielement/toolbarmanager.hxx | 6
framework/inc/uielement/uicommanddescription.hxx | 22 +--
framework/inc/uifactory/configurationaccessfactorymanager.hxx | 10 -
framework/inc/uifactory/factoryconfiguration.hxx | 5
framework/inc/xml/imagesdocumenthandler.hxx | 10 -
framework/inc/xml/statusbardocumenthandler.hxx | 10 -
framework/inc/xml/toolboxdocumenthandler.hxx | 8 -
framework/source/fwe/classes/addonsoptions.cxx | 8 -
framework/source/inc/accelerators/acceleratorcache.hxx | 8 -
framework/source/inc/accelerators/keymapping.hxx | 8 -
framework/source/inc/accelerators/storageholder.hxx | 8 -
framework/source/services/desktop.cxx | 2
framework/source/services/frame.cxx | 2
framework/source/services/substitutepathvars.cxx | 6
framework/source/services/tabwindowservice.cxx | 8 -
framework/source/uiconfiguration/imagemanagerimpl.hxx | 19 +-
framework/source/uiconfiguration/moduleuicfgsupplier.cxx | 6
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 16 +-
framework/source/uiconfiguration/uicategorydescription.cxx | 10 -
framework/source/uiconfiguration/uiconfigurationmanager.cxx | 14 +-
framework/source/uiconfiguration/windowstateconfiguration.cxx | 26 +--
framework/source/uielement/controlmenucontroller.cxx | 8 -
framework/source/uielement/newmenucontroller.cxx | 2
framework/source/uielement/toolbarsmenucontroller.cxx | 2
framework/source/uielement/uicommanddescription.cxx | 8 -
helpcompiler/inc/HelpCompiler.hxx | 6
helpcompiler/source/HelpLinker.cxx | 2
idlc/inc/idlc/idlctypes.hxx | 10 -
idlc/inc/idlc/options.hxx | 2
idlc/source/idlc.cxx | 2
include/basic/codecompletecache.hxx | 6
include/codemaker/generatedtypeset.hxx | 4
include/codemaker/options.hxx | 5
include/filter/msfilter/svxmsbas.hxx | 4
include/framework/titlehelper.hxx | 1
include/oox/export/chartexport.hxx | 2
include/oox/export/shapes.hxx | 4
include/sfx2/sidebar/Theme.hxx | 26 +--
include/svl/IndexedStyleSheets.hxx | 4
include/svl/listener.hxx | 4
include/svtools/framestatuslistener.hxx | 10 -
include/svtools/statusbarcontroller.hxx | 12 -
include/svtools/toolboxcontroller.hxx | 10 -
include/svx/ShapeTypeHandler.hxx | 7 -
include/svx/sdasitm.hxx | 8 -
include/toolkit/controls/eventcontainer.hxx | 5
include/tools/pstm.hxx | 4
include/unotools/atom.hxx | 12 -
include/unotools/eventcfg.hxx | 8 -
include/unotools/fontcfg.hxx | 10 -
include/unotools/mediadescriptor.hxx | 2
include/vbahelper/vbaeventshelperbase.hxx | 6
include/vcl/configsettings.hxx | 10 -
include/vcl/lazydelete.hxx | 4
include/vcl/opengl/OpenGLContext.hxx | 1
include/vcl/ppdparser.hxx | 12 -
include/vcl/print.hxx | 4
include/vcl/printerinfomanager.hxx | 4
include/xmloff/nmspmap.hxx | 8 -
include/xmloff/prstylei.hxx | 4
io/source/acceptor/acc_socket.cxx | 4
io/source/connector/connector.hxx | 4
io/source/stm/odata.cxx | 6
l10ntools/inc/cfgmerge.hxx | 5
l10ntools/inc/export.hxx | 23 ++-
l10ntools/inc/xmlparse.hxx | 8 -
l10ntools/source/helpmerge.cxx | 1
linguistic/source/convdic.hxx | 8 -
lotuswordpro/source/filter/lwpfoundry.hxx | 3
lotuswordpro/source/filter/lwpheader.hxx | 3
lotuswordpro/source/filter/lwpobjfactory.hxx | 4
oox/inc/drawingml/customshapeproperties.hxx | 4
oox/inc/pch/precompiled_oox.hxx | 4
oox/source/drawingml/customshapegeometry.cxx | 4
oox/source/export/chartexport.cxx | 4
oox/source/export/shapes.cxx | 2
oox/source/ole/vbacontrol.cxx | 4
oox/source/ole/vbamodule.cxx | 1
package/inc/HashMaps.hxx | 8 -
package/source/manifest/ManifestImport.hxx | 2
package/source/xstor/ohierarchyholder.hxx | 4
package/source/zippackage/ZipPackageFolderEnumeration.hxx | 2
pyuno/source/module/pyuno_impl.hxx | 12 -
pyuno/source/module/pyuno_module.cxx | 4
registry/source/regimpl.hxx | 4
reportdesign/source/core/sdr/UndoEnv.cxx | 2
rsc/inc/rschash.hxx | 6
rsc/inc/rsclex.hxx | 4
rsc/source/parser/rscibas.cxx | 4
rsc/source/parser/rsclex.cxx | 2
rsc/source/tools/rschash.cxx | 4
sal/osl/all/debugbase.cxx | 1
svl/inc/pch/precompiled_svl.hxx | 2
svl/qa/unit/items/test_IndexedStyleSheets.cxx | 1
svl/source/inc/poolio.hxx | 4
svl/source/items/itemprop.cxx | 10 -
svl/source/misc/sharedstringpool.cxx | 8 -
svl/source/notify/broadcast.cxx | 1
svtools/inc/pch/precompiled_svt.hxx | 2
svtools/source/table/cellvalueconversion.cxx | 5
svtools/source/uno/framestatuslistener.cxx | 2
svtools/source/uno/statusbarcontroller.cxx | 2
svtools/source/uno/toolboxcontroller.cxx | 2
svx/source/table/accessibletableshape.cxx | 2
testtools/source/performance/ubtest.cxx | 6
toolkit/source/controls/dialogcontrol.cxx | 8 -
toolkit/source/controls/geometrycontrolmodel.cxx | 6
tools/inc/pch/precompiled_tl.hxx | 2
tools/source/rc/resmgr.cxx | 19 +-
ucbhelper/source/provider/contenthelper.cxx | 5
ucbhelper/source/provider/providerhelper.cxx | 5
unotools/inc/pch/precompiled_utl.hxx | 2
unotools/source/config/cmdoptions.cxx | 4
unotools/source/config/eventcfg.cxx | 1
unotools/source/config/extendedsecurityoptions.cxx | 6
unotools/source/config/fontcfg.cxx | 6
unotools/source/config/optionsdlg.cxx | 5
unotools/source/config/pathoptions.cxx | 8 -
unotools/source/config/viewoptions.cxx | 1
unotools/source/misc/atom.cxx | 10 -
unotools/source/misc/fontdefs.cxx | 4
unoxml/source/dom/node.hxx | 4
uui/source/iahndl.hxx | 9 -
vbahelper/inc/pch/precompiled_msforms.hxx | 2
vbahelper/inc/pch/precompiled_vbahelper.hxx | 2
vbahelper/source/msforms/vbacontrols.cxx | 6
vbahelper/source/vbahelper/vbaapplicationbase.cxx | 5
vbahelper/source/vbahelper/vbadocumentsbase.cxx | 4
vcl/generic/fontmanager/fontconfig.cxx | 10 -
vcl/generic/fontmanager/fontmanager.cxx | 66 +++++-----
vcl/generic/glyphs/gcach_ftyp.cxx | 2
vcl/generic/glyphs/gcach_ftyp.hxx | 6
vcl/generic/print/glyphset.hxx | 6
vcl/inc/PhysicalFontCollection.hxx | 2
vcl/inc/cupsmgr.hxx | 12 -
vcl/inc/fontcache.hxx | 6
vcl/inc/fontmanager.hxx | 38 ++---
vcl/inc/generic/glyphcache.hxx | 9 -
vcl/inc/generic/printergfx.hxx | 1
vcl/inc/headless/svpinst.hxx | 1
vcl/inc/image.h | 4
vcl/inc/impimagetree.hxx | 9 -
vcl/inc/jobset.h | 4
vcl/inc/opengl/program.hxx | 4
vcl/inc/outdev.h | 2
vcl/inc/outfont.hxx | 4
vcl/inc/print.h | 4
vcl/inc/svdata.hxx | 4
vcl/inc/unx/saldisp.hxx | 6
vcl/inc/unx/salinst.h | 2
vcl/opengl/program.cxx | 4
vcl/source/control/tabctrl.cxx | 8 -
vcl/source/gdi/configsettings.cxx | 4
vcl/source/gdi/jobset.cxx | 2
vcl/source/gdi/pdfwriter_impl.cxx | 16 +-
vcl/source/gdi/pdfwriter_impl.hxx | 14 +-
vcl/source/gdi/print.cxx | 8 -
vcl/source/gdi/print3.cxx | 24 +--
vcl/source/helper/canvastools.cxx | 1
vcl/source/outdev/font.cxx | 2
vcl/unx/generic/dtrans/X11_selection.cxx | 54 ++++----
vcl/unx/generic/dtrans/X11_selection.hxx | 14 +-
vcl/unx/generic/dtrans/X11_service.cxx | 2
vcl/unx/generic/gdi/salgdi3.cxx | 1
vcl/unx/generic/printer/cupsmgr.cxx | 20 +--
vcl/unx/generic/printer/ppdparser.cxx | 13 +
vcl/unx/generic/printer/printerinfomanager.cxx | 30 ++--
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 4
writerfilter/inc/pch/precompiled_writerfilter.hxx | 2
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 5
writerfilter/source/dmapper/TagLogger.cxx | 4
writerperfect/source/common/WPXSvInputStream.cxx | 6
xmlhelp/source/cxxhelp/provider/databases.hxx | 20 +--
xmlhelp/source/cxxhelp/provider/db.hxx | 6
xmloff/inc/StyleMap.hxx | 4
xmloff/inc/pch/precompiled_xo.hxx | 2
xmloff/inc/pch/precompiled_xof.hxx | 2
xmloff/source/core/nmspmap.cxx | 2
xmloff/source/draw/EnhancedCustomShapeToken.cxx | 4
xmloff/source/draw/ximpcustomshape.cxx | 4
xmloff/source/forms/property_meta_data.cxx | 10 -
xmloff/source/text/txtparae.cxx | 8 -
xmloff/source/transform/EventOASISTContext.cxx | 4
xmloff/source/transform/EventOOoTContext.cxx | 4
xmloff/source/transform/TransformerActions.hxx | 5
xmloff/source/transform/TransformerTokenMap.hxx | 4
xmlscript/inc/pch/precompiled_xmlscript.hxx | 2
xmlscript/source/xml_helper/xml_impctx.cxx | 9 -
239 files changed, 794 insertions(+), 826 deletions(-)
New commits:
commit 4cf326dd43cb7a39deae02a475423b161cd589c4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 2 13:43:53 2015 +0000
attempt to compare a singular iterator to a singular iterator
falls over during build with debug stl
Change-Id: Id7241e1275067f827e4a663eb901c41e4c9873f5
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index f625b30..28b678b 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -250,8 +250,17 @@ class MergeDataHashMap
typedef std::unordered_map<OString, MergeData*, OStringHash> HashMap_t;
public:
- MergeDataHashMap():bFirstSearch(true){};
- ~MergeDataHashMap(){};
+ MergeDataHashMap()
+ : bFirstSearch(true)
+ , aLastInsertion(m_aHashMap.end())
+ , aLastFound(m_aHashMap.end())
+ , aFirstInOrder(m_aHashMap.end())
+ {
+ }
+
+ ~MergeDataHashMap()
+ {
+ }
typedef HashMap_t::iterator iterator;
typedef HashMap_t::const_iterator const_iterator;
@@ -267,10 +276,10 @@ class MergeDataHashMap
private:
bool bFirstSearch;
+ HashMap_t m_aHashMap;
iterator aLastInsertion;
iterator aLastFound;
iterator aFirstInOrder;
- HashMap_t m_aHashMap;
};
commit fd1372ba8b1c3eb3c7fad6d9c623176c8071f31b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 1 19:58:59 2015 +0000
boost::unordered_map->std::unordered_map
you can get debug stl this way
Change-Id: Ia70a3e7c7c452390e8bee34975d296c9318e4a19
diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx
index 43dffac..353903b 100644
--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ b/accessibility/inc/pch/precompiled_acc.hxx
@@ -16,7 +16,6 @@
#include <algorithm>
#include <boost/noncopyable.hpp>
-#include <boost/unordered_map.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index bb58ae6..2dd16ac 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -26,7 +26,6 @@
#include <algorithm>
#include <vector>
-#include <boost/unordered_map.hpp>
namespace accessibility
{
diff --git a/canvas/source/opengl/ogl_texturecache.hxx b/canvas/source/opengl/ogl_texturecache.hxx
index 8fa14fe..b8c384f 100644
--- a/canvas/source/opengl/ogl_texturecache.hxx
+++ b/canvas/source/opengl/ogl_texturecache.hxx
@@ -11,7 +11,7 @@
#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TEXTURECACHE_HXX
#include <sal/types.h>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace com { namespace sun { namespace star {
namespace geometry { struct IntegerSize2D; }
@@ -52,7 +52,7 @@ namespace oglcanvas
unsigned int nTexture;
bool bOld;
};
- typedef boost::unordered_map<sal_uInt32,CacheEntry> TextureCacheMapT;
+ typedef std::unordered_map<sal_uInt32,CacheEntry> TextureCacheMapT;
mutable TextureCacheMapT maCache;
mutable sal_uInt32 mnMissCount;
mutable sal_uInt32 mnHitCount;
diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx
index 13ea4bc..1c1e6c0 100644
--- a/chart2/source/inc/DataSeriesHelper.hxx
+++ b/chart2/source/inc/DataSeriesHelper.hxx
@@ -29,9 +29,8 @@
#include "StackMode.hxx"
#include "charttoolsdllapi.hxx"
-#include <vector>
#include <functional>
-#include <boost/unordered_map.hpp>
+#include <vector>
namespace chart
{
diff --git a/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx
index be066ca..9d52c07 100644
--- a/chart2/source/inc/PropertyHelper.hxx
+++ b/chart2/source/inc/PropertyHelper.hxx
@@ -25,17 +25,17 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/property.hxx>
-#include <map>
#include "charttoolsdllapi.hxx"
-#include <boost/unordered_map.hpp>
+#include <map>
+#include <unordered_map>
namespace chart
{
typedef int tPropertyValueMapKey;
-typedef boost::unordered_map<tPropertyValueMapKey, com::sun::star::uno::Any> tPropertyValueMap;
+typedef std::unordered_map<tPropertyValueMapKey, css::uno::Any> tPropertyValueMap;
namespace PropertyHelper
{
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 3716797..8acf427 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -70,6 +70,7 @@
#include <functional>
#include <map>
+#include <unordered_map>
#include <boost/ptr_container/ptr_map.hpp>
@@ -1584,7 +1585,7 @@ class PerXMinMaxCalculator
typedef std::pair<double, double> MinMaxType;
typedef std::map<size_t, MinMaxType> SeriesMinMaxType;
typedef boost::ptr_map<double, SeriesMinMaxType> GroupMinMaxType;
- typedef boost::unordered_map<double, MinMaxType> TotalStoreType;
+ typedef std::unordered_map<double, MinMaxType> TotalStoreType;
GroupMinMaxType maSeriesGroup;
size_t mnCurSeries;
diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx
index 6b03733..64149d3 100644
--- a/chart2/source/view/main/DummyXShape.hxx
+++ b/chart2/source/view/main/DummyXShape.hxx
@@ -58,9 +58,9 @@
#include <rtl/ustring.hxx>
-#include <vector>
#include <map>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
+#include <vector>
namespace chart {
@@ -96,7 +96,7 @@ public:
private:
- boost::unordered_map<TextCacheKey, BitmapEx, TextCacheKeyHash> maCache;
+ std::unordered_map<TextCacheKey, BitmapEx, TextCacheKeyHash> maCache;
};
class DummyXShape : public cppu::WeakAggImplHelper6<
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 328f8bf..c3d32dd 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -3659,10 +3659,8 @@ bool EntrySort( SvxConfigEntry* a, SvxConfigEntry* b )
SvxEntries* ToolbarSaveInData::GetEntries()
{
- typedef ::boost::unordered_map< OUString,
- bool,
- OUStringHash,
- ::std::equal_to< OUString > > ToolbarInfo;
+ typedef std::unordered_map<OUString, bool,
+ OUStringHash, std::equal_to< OUString > > ToolbarInfo;
ToolbarInfo aToolbarInfo;
@@ -3721,7 +3719,7 @@ SvxEntries* ToolbarSaveInData::GetEntries()
pEntry->SetStyle( GetSystemStyle( url ) );
- // insert into boost::unordered_map to filter duplicates from the parent
+ // insert into std::unordered_map to filter duplicates from the parent
aToolbarInfo.insert( ToolbarInfo::value_type( systemname, true ));
OUString custom(CUSTOM_TOOLBAR_STR);
@@ -4741,10 +4739,8 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window *pWindow,
pTbSymbol->set_height_request(aTbSize.Height());
pTbSymbol->SetStyle(pTbSymbol->GetStyle() | WB_SCROLL | WB_LINESPACING);
- typedef ::boost::unordered_map< OUString,
- bool,
- OUStringHash,
- ::std::equal_to< OUString > > ImageInfo;
+ typedef std::unordered_map< OUString, bool,
+ OUStringHash, std::equal_to< OUString > > ImageInfo;
pTbSymbol->SetPageScroll( true );
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index f151c36..c1cded1 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -30,10 +30,11 @@
#include <vcl/lstbox.hxx>
#include <rtl/ustring.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <vector>
-typedef ::boost::unordered_map< OUString, ::std::pair< OUString, OUString >, OUStringHash, ::std::equal_to< OUString > > EventsHash;
+typedef std::unordered_map< OUString, std::pair< OUString, OUString >,
+ OUStringHash, std::equal_to< OUString > > EventsHash;
struct EventDisplayName
{
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index a3d3f0d..0a734a9 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -32,7 +32,7 @@
#include <com/sun/star/script/browse/XBrowseNode.hpp>
#include <com/sun/star/frame/XModel.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#define OBJTYPE_BASICMANAGER 1L
#define OBJTYPE_METHOD 2L
@@ -43,8 +43,8 @@
#define INPUTMODE_NEWMACRO 2
#define INPUTMODE_RENAME 3
-typedef ::boost::unordered_map < OUString, OUString ,
- OUStringHash, ::std::equal_to< OUString > > Selection_hash;
+typedef std::unordered_map < OUString, OUString,
+ OUStringHash, std::equal_to< OUString > > Selection_hash;
class SFEntry;
diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx
index bdcebd7..fbdb795 100644
--- a/dbaccess/inc/pch/precompiled_dbu.hxx
+++ b/dbaccess/inc/pch/precompiled_dbu.hxx
@@ -35,8 +35,8 @@
#include <boost/scoped_array.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
-#include <boost/unordered_map.hpp>
#include <cassert>
+#include <unordered_map>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/dbaccess/source/core/recovery/subcomponents.hxx b/dbaccess/source/core/recovery/subcomponents.hxx
index dfa944e..e48d32b 100644
--- a/dbaccess/source/core/recovery/subcomponents.hxx
+++ b/dbaccess/source/core/recovery/subcomponents.hxx
@@ -26,8 +26,8 @@
#include <rtl/ustring.hxx>
-#include <boost/unordered_map.hpp>
#include <map>
+#include <unordered_map>
namespace dbaccess
{
@@ -62,8 +62,8 @@ namespace dbaccess
}
};
- typedef ::boost::unordered_map< OUString, SubComponentDescriptor, OUStringHash > MapStringToCompDesc;
- typedef ::std::map< SubComponentType, MapStringToCompDesc > MapCompTypeToCompDescs;
+ typedef std::unordered_map< OUString, SubComponentDescriptor, OUStringHash > MapStringToCompDesc;
+ typedef std::map< SubComponentType, MapStringToCompDesc > MapCompTypeToCompDescs;
} // namespace dbaccess
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 310078b..99e2fd7 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -56,9 +56,9 @@
#include <algorithm>
#include <o3tl/compat_functional.hxx>
#include <boost/scoped_ptr.hpp>
-#include <boost/unordered_map.hpp>
#include <cppuhelper/implbase1.hxx>
#include <limits>
+#include <unordered_map>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -79,7 +79,7 @@ using namespace ::comphelper;
#define FIRST_USER_DEFINED_FEATURE ( ::std::numeric_limits< sal_uInt16 >::max() - 1000 )
#define LAST_USER_DEFINED_FEATURE ( ::std::numeric_limits< sal_uInt16 >::max() )
-typedef ::boost::unordered_map< sal_Int16, sal_Int16 > CommandHashMap;
+typedef std::unordered_map< sal_Int16, sal_Int16 > CommandHashMap;
typedef ::std::list< DispatchInformation > DispatchInfoList;
namespace dbaui
diff --git a/desktop/inc/pch/precompiled_deployment.hxx b/desktop/inc/pch/precompiled_deployment.hxx
index 4a2220f..fe14641 100644
--- a/desktop/inc/pch/precompiled_deployment.hxx
+++ b/desktop/inc/pch/precompiled_deployment.hxx
@@ -17,9 +17,9 @@
#include <algorithm>
#include <boost/bind.hpp>
#include <boost/optional.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/unordered_set.hpp>
#include <cassert>
+#include <unordered_map>
+#include <unordered_set>
#include <com/sun/star/beans/Ambiguous.hpp>
#include <com/sun/star/beans/Optional.hpp>
#include <com/sun/star/beans/StringPair.hpp>
diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx
index 228b6a1..4b99407 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/frame/XDispatchResultListener.hpp>
#include "officeipcthread.hxx"
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <vector>
namespace desktop
@@ -39,7 +39,7 @@ namespace desktop
running office without UI.
*/
-class DispatchWatcherHashMap : public ::boost::unordered_map< OUString, sal_Int32, OUStringHash, ::std::equal_to< OUString > >
+class DispatchWatcherHashMap : public std::unordered_map< OUString, sal_Int32, OUStringHash, std::equal_to< OUString > >
{
public:
inline void free()
diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h
index dcbc4d1..9a86fff 100644
--- a/desktop/source/deployment/inc/dp_persmap.h
+++ b/desktop/source/deployment/inc/dp_persmap.h
@@ -22,12 +22,12 @@
#include <rtl/ustring.hxx>
#include <osl/file.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace dp_misc
{
-typedef ::boost::unordered_map<
+typedef std::unordered_map<
OString, OString, OStringHash > t_string2string_map;
// Class to read obsolete registered extensions
diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx
index 42f6b41..d19337f 100644
--- a/desktop/source/deployment/manager/dp_activepackages.cxx
+++ b/desktop/source/deployment/manager/dp_activepackages.cxx
@@ -32,7 +32,6 @@
#include <rtl/uri.h>
#include <rtl/uri.hxx>
#include <rtl/ustring.hxx>
-#include <boost/unordered_map.hpp>
#include "dp_identifier.hxx"
#include "dp_activepackages.hxx"
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 72dab66..4643794 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -54,7 +54,6 @@
#include <boost/bind.hpp>
#include <list>
-#include <boost/unordered_map.hpp>
#include <algorithm>
#include <set>
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index f905c25..32856ca 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -31,13 +31,13 @@
#include <com/sun/star/deployment/XPackageManager.hpp>
#include <osl/mutex.hxx>
#include <list>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace dp_manager {
-typedef ::boost::unordered_map<
+typedef std::unordered_map<
OUString,
- ::std::vector<css::uno::Reference<css::deployment::XPackage> >,
+ std::vector<css::uno::Reference<css::deployment::XPackage> >,
OUStringHash > id2extensions;
class ExtensionManager : private ::dp_misc::MutexHolder,
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index 91c3975..49238f9 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -23,8 +23,7 @@
#include <cppuhelper/compbase1.hxx>
#include <comphelper/servicedecl.hxx>
#include <com/sun/star/deployment/thePackageManagerFactory.hpp>
-#include <boost/unordered_map.hpp>
-
+#include <unordered_map>
using namespace ::dp_misc;
using namespace ::com::sun::star;
@@ -46,7 +45,7 @@ class PackageManagerFactoryImpl : private MutexHolder, public t_pmfac_helper
Reference<deployment::XPackageManager> m_xBundledMgr;
Reference<deployment::XPackageManager> m_xTmpMgr;
Reference<deployment::XPackageManager> m_xBakMgr;
- typedef ::boost::unordered_map<
+ typedef std::unordered_map<
OUString, WeakReference<deployment::XPackageManager>,
OUStringHash > t_string2weakref;
t_string2weakref m_managers;
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 4b69637..5a3cce3 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -42,11 +42,11 @@
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/ucb/NameClash.hpp>
#include <com/sun/star/util/theMacroExpander.hpp>
+#include <algorithm>
#include <list>
-#include <boost/unordered_map.hpp>
-#include <vector>
#include <memory>
-#include <algorithm>
+#include <unordered_map>
+#include <vector>
#include "dp_compbackenddb.hxx"
using namespace ::dp_misc;
@@ -265,8 +265,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
bool m_unorc_modified;
bool bSwitchedRdbFiles;
- typedef ::boost::unordered_map< OUString, Reference<XInterface>,
- OUStringHash > t_string2object;
+ typedef std::unordered_map< OUString, Reference<XInterface>,
+ OUStringHash > t_string2object;
t_string2object m_backendObjects;
// PackageRegistryBackend
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index a5d364d..b603682 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -42,9 +42,9 @@
#include <com/sun/star/util/XUpdatable.hpp>
#include <com/sun/star/container/XContentEnumerationAccess.hpp>
#include <com/sun/star/deployment/PackageRegistryBackend.hpp>
-#include <boost/unordered_map.hpp>
#include <set>
-#include <boost/unordered_set.hpp>
+#include <unordered_map>
+#include <unordered_set>
using namespace ::dp_misc;
using namespace ::com::sun::star;
@@ -72,13 +72,13 @@ class PackageRegistryImpl : private MutexHolder, public t_helper
return str1.equalsIgnoreAsciiCase( str2 );
}
};
- typedef ::boost::unordered_map<
+ typedef std::unordered_map<
OUString, Reference<deployment::XPackageRegistry>,
ci_string_hash, ci_string_equals > t_string2registry;
- typedef ::boost::unordered_map<
+ typedef std::unordered_map<
OUString, OUString,
ci_string_hash, ci_string_equals > t_string2string;
- typedef ::std::set<
+ typedef std::set<
Reference<deployment::XPackageRegistry> > t_registryset;
t_string2registry m_mediaType2backend;
@@ -189,7 +189,7 @@ void PackageRegistryImpl::insertBackend(
Reference<deployment::XPackageRegistry> const & xBackend )
{
m_allBackends.insert( xBackend );
- typedef ::boost::unordered_set<OUString, OUStringHash> t_stringset;
+ typedef std::unordered_set<OUString, OUStringHash> t_stringset;
t_stringset ambiguousFilters;
const Sequence< Reference<deployment::XPackageTypeInfo> > packageTypes(
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 034ccb2..cdc6164 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -73,8 +73,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
};
friend class ExecutablePackageImpl;
- typedef ::boost::unordered_map< OUString, Reference<XInterface>,
- OUStringHash > t_string2object;
+ typedef std::unordered_map< OUString, Reference<XInterface>,
+ OUStringHash > t_string2object;
// PackageRegistryBackend
virtual Reference<deployment::XPackage> bindPackage_(
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index 99ae4f4..e5ee57c 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -33,8 +33,8 @@
#include <com/sun/star/deployment/XPackageRegistry.hpp>
#include <com/sun/star/deployment/XPackageManager.hpp>
#include <com/sun/star/deployment/InvalidRemovedParameterException.hpp>
-#include <boost/unordered_map.hpp>
#include <list>
+#include <unordered_map>
#include "dp_registry.hrc"
namespace dp_registry
@@ -277,7 +277,7 @@ class PackageRegistryBackend
// XPackageManager::getDeployedPackages is called often. This results in a lot
//of bindPackage calls which are costly. Therefore we keep hard references in
//the map now.
- typedef ::boost::unordered_map<
+ typedef std::unordered_map<
OUString, css::uno::Reference<css::deployment::XPackage>,
OUStringHash > t_string2ref;
t_string2ref m_bound;
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index 4bb99e4..4f304fb 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -19,10 +19,10 @@
#ifndef INCLUDED_DESKTOP_SOURCE_MIGRATION_MIGRATION_IMPL_HXX
#define INCLUDED_DESKTOP_SOURCE_MIGRATION_MIGRATION_IMPL_HXX
-#include <vector>
#include <algorithm>
#include <memory>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
+#include <vector>
#include "migration.hxx"
@@ -125,10 +125,8 @@ struct MigrationItem
OUString GetPrevSibling() const { return m_sPrevSibling; }
};
-typedef ::boost::unordered_map< OUString,
- ::std::vector< MigrationItem >,
- OUStringHash,
- ::std::equal_to< OUString > > MigrationHashMap;
+typedef std::unordered_map< OUString, std::vector< MigrationItem >,
+ OUStringHash, std::equal_to< OUString > > MigrationHashMap;
struct MigrationItemInfo
{
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index 30fed2f..b7da7d2 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -26,8 +26,8 @@
#include <boost/ref.hpp>
#include <boost/scoped_array.hpp>
#include <boost/scoped_ptr.hpp>
-#include <boost/unordered_map.hpp>
#include <cassert>
+#include <unordered_map>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index f75d85c..63932c9 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -76,10 +76,10 @@
#include <svtools/rtfkeywd.hxx>
#include <editeng/edtdlg.hxx>
-#include <vector>
#include <boost/scoped_ptr.hpp>
#include <boost/make_shared.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
+#include <vector>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -454,7 +454,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
rOutput.WriteChar( '}' );
rOutput << endl;
- boost::unordered_map<SfxStyleSheetBase*, sal_uInt32> aStyleSheetToIdMap;
+ std::unordered_map<SfxStyleSheetBase*, sal_uInt32> aStyleSheetToIdMap;
// StyleSheets...
if ( GetStyleSheetPool() )
{
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 0003029..a2754c4 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -64,6 +64,8 @@
#include <com/sun/star/ucb/NameClash.hpp>
#include <xmloff/xmltoken.hxx>
#include <vcl/help.hxx>
+#include <set>
+#include <unordered_map>
using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::uno;
@@ -2697,7 +2699,7 @@ struct CompareSvxAutocorrWordList
namespace {
typedef std::set<SvxAutocorrWord*, CompareSvxAutocorrWordList> AutocorrWordSetType;
-typedef boost::unordered_map<OUString, SvxAutocorrWord*, OUStringHash> AutocorrWordHashType;
+typedef std::unordered_map<OUString, SvxAutocorrWord*, OUStringHash> AutocorrWordHashType;
}
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index 0700000..59f08cd 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -20,7 +20,6 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <svl/eitem.hxx>
-#include <boost/unordered_map.hpp>
#include <svl/itemprop.hxx>
#include <editeng/unoipset.hxx>
diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx
index 7aac754..06214e6 100644
--- a/filter/source/config/cache/cacheitem.hxx
+++ b/filter/source/config/cache/cacheitem.hxx
@@ -20,9 +20,9 @@
#ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEITEM_HXX
#define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEITEM_HXX
-#include <boost/unordered_map.hpp>
#include <deque>
#include <list>
+#include <unordered_map>
#include <com/sun/star/uno/Any.h>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -172,10 +172,10 @@ class CacheItem : public ::comphelper::SequenceAsHashMap
/** @short represent an item list of a FilterCache
instance.
*/
-typedef ::boost::unordered_map< OUString ,
- CacheItem ,
- OUStringHash ,
- ::std::equal_to< OUString > > CacheItemList;
+typedef std::unordered_map< OUString ,
+ CacheItem ,
+ OUStringHash ,
+ std::equal_to< OUString > > CacheItemList;
@@ -191,10 +191,10 @@ typedef ::boost::unordered_map< OUString ,
there we need key-value pairs too, which can't be provided
by a pure vector!
*/
-typedef ::boost::unordered_map< OUString ,
- OUStringList ,
- OUStringHash ,
- ::std::equal_to< OUString > > CacheItemRegistration;
+typedef std::unordered_map< OUString ,
+ OUStringList ,
+ OUStringHash ,
+ std::equal_to< OUString > > CacheItemRegistration;
diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx
index 914700c..2ad810c 100644
--- a/filter/source/config/cache/querytokenizer.hxx
+++ b/filter/source/config/cache/querytokenizer.hxx
@@ -20,8 +20,8 @@
#ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_QUERYTOKENIZER_HXX
#define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_QUERYTOKENIZER_HXX
-#include <boost/unordered_map.hpp>
#include <rtl/ustring.hxx>
+#include <unordered_map>
namespace filter{
@@ -45,10 +45,10 @@ namespace filter{
@attention This class is not threadsafe implemented. Because its not necessary.
But you have to make sure, that ist not used as such :-)
*/
-class QueryTokenizer : public ::boost::unordered_map< OUString ,
- OUString ,
- OUStringHash ,
- ::std::equal_to< OUString > >
+class QueryTokenizer : public std::unordered_map< OUString ,
+ OUString ,
+ OUStringHash ,
+ std::equal_to< OUString > >
{
// member
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index fcb4a51..686eee4 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -14,7 +14,7 @@
#include <vcl/svapp.hxx>
#include <filter/msfilter/util.hxx>
#include <boost/scoped_ptr.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace msfilter {
namespace util {
@@ -1301,7 +1301,7 @@ static struct {
{"textBox", mso_sptTextBox},
};
-typedef boost::unordered_map< const char*, const char*, rtl::CStringHash, rtl::CStringEqual> CustomShapeTypeTranslationHashMap;
+typedef std::unordered_map< const char*, const char*, rtl::CStringHash, rtl::CStringEqual> CustomShapeTypeTranslationHashMap;
static CustomShapeTypeTranslationHashMap* pCustomShapeTypeTranslationHashMap = NULL;
const char* GetOOXMLPresetGeometry( const char* sShapeType )
@@ -1319,7 +1319,7 @@ const char* GetOOXMLPresetGeometry( const char* sShapeType )
return i == pCustomShapeTypeTranslationHashMap->end() ? "rect" : i->second;
}
-typedef boost::unordered_map< const char*, MSO_SPT, rtl::CStringHash, rtl::CStringEqual> DMLToVMLTranslationHashMap;
+typedef std::unordered_map< const char*, MSO_SPT, rtl::CStringHash, rtl::CStringEqual> DMLToVMLTranslationHashMap;
static DMLToVMLTranslationHashMap* pDMLToVMLMap;
MSO_SPT GETVMLShapeType(const OString& aType)
diff --git a/filter/source/svg/gfxtypes.hxx b/filter/source/svg/gfxtypes.hxx
index 01aa9e1..d93df82 100644
--- a/filter/source/svg/gfxtypes.hxx
+++ b/filter/source/svg/gfxtypes.hxx
@@ -12,10 +12,9 @@
#include <basegfx/range/b2drange.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/polygon/b2dlinegeometry.hxx>
-
-#include <boost/unordered_set.hpp>
-#include <boost/unordered_map.hpp>
#include <rtl/ustring.hxx>
+#include <unordered_set>
+#include <unordered_map>
namespace svgi
{
@@ -336,8 +335,8 @@ struct StateHash
}
};
-typedef boost::unordered_set<State, StateHash> StatePool;
-typedef boost::unordered_map<sal_Int32, State> StateMap;
+typedef std::unordered_set<State, StateHash> StatePool;
+typedef std::unordered_map<sal_Int32, State> StateMap;
} // namespace svgi
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index c0df48b..e42fbb1 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -43,8 +43,6 @@
#include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/xml/sax/XWriter.hpp>
-#include <boost/unordered_set.hpp>
-#include <boost/unordered_map.hpp>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <rtl/process.h>
@@ -63,9 +61,9 @@
#include <svx/svdxcgv.hxx>
#include <svx/svdobj.hxx>
#include <xmloff/xmlexp.hxx>
-
#include <cstdio>
-
+#include <unordered_set>
+#include <unordered_map>
using namespace ::com::sun::star::animations;
using namespace ::com::sun::star::beans;
@@ -201,18 +199,18 @@ class SVGFilter : public cppu::WeakImplHelper4 < XFilter,
XExtendedFilterDetection >
{
public:
- typedef ::boost::unordered_map< Reference< XInterface >, ObjectRepresentation, HashReferenceXInterface > ObjectMap;
- typedef ::boost::unordered_set< Reference< XInterface >, HashReferenceXInterface > ObjectSet;
+ typedef std::unordered_map< Reference< XInterface >, ObjectRepresentation, HashReferenceXInterface > ObjectMap;
+ typedef std::unordered_set< Reference< XInterface >, HashReferenceXInterface > ObjectSet;
typedef Sequence< Reference< XInterface > > ObjectSequence;
typedef Sequence< Reference< XDrawPage > > XDrawPageSequence;
- typedef ::boost::unordered_set< sal_Unicode, HashUChar > UCharSet;
- typedef ::boost::unordered_map< OUString, UCharSet, OUStringHash > UCharSetMap;
- typedef ::boost::unordered_map< Reference< XInterface >, UCharSetMap, HashReferenceXInterface > UCharSetMapMap;
+ typedef std::unordered_set< sal_Unicode, HashUChar > UCharSet;
+ typedef std::unordered_map< OUString, UCharSet, OUStringHash > UCharSetMap;
+ typedef std::unordered_map< Reference< XInterface >, UCharSetMap, HashReferenceXInterface > UCharSetMapMap;
- typedef ::boost::unordered_map< Reference< XInterface >, OUString, HashReferenceXInterface > UOStringMap;
+ typedef std::unordered_map< Reference< XInterface >, OUString, HashReferenceXInterface > UOStringMap;
- typedef ::boost::unordered_set< ObjectRepresentation, HashBitmap, EqualityBitmap > MetaBitmapActionSet;
+ typedef std::unordered_set< ObjectRepresentation, HashBitmap, EqualityBitmap > MetaBitmapActionSet;
private:
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index db506e1..41cdd98 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -43,7 +43,6 @@
#include <tools/zcodec.hxx>
#include <boost/bind.hpp>
-#include <boost/unordered_set.hpp>
#include <map>
#include <string.h>
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 459978c..0a77dd7 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FILTER_SOURCE_SVG_SVGWRITER_HXX
#define INCLUDED_FILTER_SOURCE_SVG_SVGWRITER_HXX
-#include <stack>
#include <cppuhelper/implbase1.hxx>
#include <rtl/ustring.hxx>
#include <tools/stream.hxx>
@@ -59,7 +58,8 @@
#include <com/sun/star/style/NumberingType.hpp>
#include <com/sun/star/svg/XSVGWriter.hpp>
-
+#include <stack>
+#include <unordered_map>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
@@ -175,7 +175,7 @@ struct BulletListItemInfo
class SVGTextWriter
{
public:
- typedef ::boost::unordered_map< OUString, BulletListItemInfo, OUStringHash > BulletListItemInfoMap;
+ typedef std::unordered_map< OUString, BulletListItemInfo, OUStringHash > BulletListItemInfoMap;
private:
SVGExport& mrExport;
diff --git a/forms/inc/pch/precompiled_frm.hxx b/forms/inc/pch/precompiled_frm.hxx
index 173b0b9..829ed3b 100644
--- a/forms/inc/pch/precompiled_frm.hxx
+++ b/forms/inc/pch/precompiled_frm.hxx
@@ -25,7 +25,6 @@
#include <algorithm>
#include <boost/optional.hpp>
#include <boost/scoped_ptr.hpp>
-#include <boost/unordered_map.hpp>
#include <com/sun/star/awt/ActionEvent.hpp>
#include <com/sun/star/awt/FontEmphasisMark.hpp>
#include <com/sun/star/awt/FontRelief.hpp>
@@ -339,6 +338,7 @@
#include <ucbhelper/activedatasink.hxx>
#include <ucbhelper/content.hxx>
#include <uno/mapping.hxx>
+#include <unordered_map>
#include <unotools/datetime.hxx>
#include <unotools/desktopterminationobserver.hxx>
#include <unotools/lingucfg.hxx>
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index f1b9736..fe0c0d6 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -82,7 +82,7 @@
#include <osl/mutex.hxx>
#include <ctype.h>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
// compatibility: DatabaseCursorType is dead, but for compatibility reasons we still have to write it ...
namespace com {
diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx
index 4ea3502..cf979d4 100644
--- a/forms/source/component/Filter.hxx
+++ b/forms/source/component/Filter.hxx
@@ -38,7 +38,7 @@
#include <connectivity/sqlparse.hxx>
#include <svx/ParseContext.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace frm
@@ -68,7 +68,7 @@ namespace frm
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xMessageParent;
- typedef ::boost::unordered_map< OUString, OUString, OUStringHash > MapString2String;
+ typedef std::unordered_map< OUString, OUString, OUStringHash > MapString2String;
MapString2String m_aDisplayItemToValueItem;
OUString m_aText;
diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx
index 36a219a..d04c020 100644
--- a/forms/source/inc/InterfaceContainer.hxx
+++ b/forms/source/inc/InterfaceContainer.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FORMS_SOURCE_INC_INTERFACECONTAINER_HXX
#define INCLUDED_FORMS_SOURCE_INC_INTERFACECONTAINER_HXX
-#include <boost/unordered_map.hpp>
#include <comphelper/types.hxx>
#include <comphelper/uno3.hxx>
#include <com/sun/star/container/XNameReplace.hpp>
@@ -45,6 +44,7 @@
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/component.hxx>
#include <cppuhelper/implbase8.hxx>
+#include <unordered_map>
namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
@@ -76,8 +76,8 @@ namespace frm
ElementDescription& operator=( const ElementDescription& ); // never implemented
};
-typedef ::std::vector<InterfaceRef> OInterfaceArray;
-typedef ::boost::unordered_multimap< OUString, InterfaceRef, OUStringHash > OInterfaceMap;
+typedef std::vector<InterfaceRef> OInterfaceArray;
+typedef std::unordered_multimap< OUString, InterfaceRef, OUStringHash > OInterfaceMap;
// OInterfaceContainer
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index 3122293..8825a6b 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -20,13 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHEDATA_HXX
#define INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHEDATA_HXX
-/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
- with solaris headers ...
-*/
-#include <boost/unordered_map.hpp>
-#include <vector>
-#include <iterator>
-
#include <classes/checkediterator.hxx>
#include <classes/wildcard.hxx>
#include <classes/converter.hxx>
@@ -45,6 +38,10 @@
#include <cppuhelper/weak.hxx>
#include <rtl/ustring.hxx>
+#include <iterator>
+#include <unordered_map>
+#include <vector>
+
namespace framework{
#define DEFAULT_FILTERCACHE_VERSION 6 /// these implmentation of FilterCache support different version of TypeDetection.xml! This define the current set default one.
@@ -323,10 +320,10 @@ struct ContentHandler
// and could be used in a generic way
template< class HashType >
-class SetNodeHash : public ::boost::unordered_map< OUString ,
- HashType ,
- OUStringHash ,
- ::std::equal_to< OUString > >
+class SetNodeHash : public std::unordered_map< OUString ,
+ HashType ,
+ OUStringHash ,
+ std::equal_to< OUString > >
{
// interface
@@ -361,10 +358,10 @@ class SetNodeHash : public ::boost::unordered_map< OUString ,
// It's an optimism to find registered services faster!
// The preferred hash maps file extensions to preferred types to find these ones faster.
-class PerformanceHash : public ::boost::unordered_map< OUString ,
+class PerformanceHash : public std::unordered_map< OUString ,
OUStringList ,
OUStringHash ,
- ::std::equal_to< OUString > >
+ std::equal_to< OUString > >
{
public:
diff --git a/framework/inc/pch/precompiled_fwe.hxx b/framework/inc/pch/precompiled_fwe.hxx
index 41ae73f..1747dc0 100644
--- a/framework/inc/pch/precompiled_fwe.hxx
+++ b/framework/inc/pch/precompiled_fwe.hxx
@@ -16,7 +16,7 @@
#include <algorithm>
#include <boost/function.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <com/sun/star/awt/XBitmap.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx
index c37deaf..ee59e90 100644
--- a/framework/inc/pch/precompiled_fwk.hxx
+++ b/framework/inc/pch/precompiled_fwk.hxx
@@ -16,10 +16,10 @@
#include "officecfg/Office/Common.hxx"
#include <algorithm>
+#include <unordered_map>
#include <boost/bind.hpp>
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
-#include <boost/unordered_map.hpp>
#include <boost/utility.hpp>
#include <com/sun/star/awt/Command.hpp>
#include <com/sun/star/awt/ContainerWindowProvider.hpp>
diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h
index 3ff9e0d..8e9dfaf 100644
--- a/framework/inc/stdtypes.h
+++ b/framework/inc/stdtypes.h
@@ -20,9 +20,9 @@
#ifndef INCLUDED_FRAMEWORK_INC_STDTYPES_H
#define INCLUDED_FRAMEWORK_INC_STDTYPES_H
-#include <vector>
#include <queue>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
+#include <vector>
#include "general.h"
@@ -120,15 +120,15 @@ class OUStringList : public ::comphelper::SequenceAsVector< OUString >
typedef ::std::queue< OUString > OUStringQueue;
/**
- Basic hash based on a boost::unordered_map() which provides key=[OUString] and value=[template type] pairs
+ Basic hash based on a std::unordered_map() which provides key=[OUString] and value=[template type] pairs
It implements some additional funtionality which can be useful but
is missing at the normal hash implementation.
*/
template< class TType >
-class BaseHash : public ::boost::unordered_map< OUString ,
- TType ,
- OUStringHash ,
- ::std::equal_to< OUString > >
+class BaseHash : public std::unordered_map< OUString ,
+ TType ,
+ OUStringHash ,
+ std::equal_to< OUString > >
{
public:
diff --git a/framework/inc/uiconfiguration/globalsettings.hxx b/framework/inc/uiconfiguration/globalsettings.hxx
index acff405..f949f3c 100644
--- a/framework/inc/uiconfiguration/globalsettings.hxx
+++ b/framework/inc/uiconfiguration/globalsettings.hxx
@@ -20,13 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_GLOBALSETTINGS_HXX
#define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_GLOBALSETTINGS_HXX
-/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
- with solaris headers ...
-*/
-#include <vector>
-#include <list>
-#include <boost/unordered_map.hpp>
-
#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
@@ -40,6 +33,9 @@
#include <cppuhelper/weak.hxx>
#include <rtl/ustring.hxx>
+#include <vector>
+#include <list>
+
namespace framework
{
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index 250a505..1a5ee6d 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_IMAGEMANAGER_HXX
#define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_IMAGEMANAGER_HXX
-#include <boost/unordered_map.hpp>
#include <memory>
#include <stdtypes.h>
diff --git a/framework/inc/uiconfiguration/imagetype.hxx b/framework/inc/uiconfiguration/imagetype.hxx
index 46b61ad..6c3cf32 100644
--- a/framework/inc/uiconfiguration/imagetype.hxx
+++ b/framework/inc/uiconfiguration/imagetype.hxx
@@ -20,8 +20,8 @@
#ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_IMAGETYPE_HXX
#define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_IMAGETYPE_HXX
-#include <boost/unordered_map.hpp>
#include <rtl/ustring.hxx>
+#include <unordered_map>
namespace framework
{
@@ -33,14 +33,14 @@ enum ImageType
ImageType_COUNT
};
-typedef boost::unordered_map< OUString,
- OUString,
- OUStringHash,
- ::std::equal_to< OUString > > CommandToImageNameMap;
-typedef boost::unordered_map< OUString,
- bool,
- OUStringHash,
- ::std::equal_to< OUString > > CommandMap;
+typedef std::unordered_map< OUString,
+ OUString,
+ OUStringHash,
+ std::equal_to< OUString > > CommandToImageNameMap;
+typedef std::unordered_map< OUString,
+ bool,
+ OUStringHash,
+ std::equal_to< OUString > > CommandMap;
}
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index 7cd3c13..ab6e9c2 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -20,14 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX
#define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX
-/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
- with solaris headers ...
-*/
-#include <vector>
-#include <list>
-#include <boost/unordered_map.hpp>
-#include <memory>
-
#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
@@ -53,6 +45,10 @@
#include <vcl/image.hxx>
#include <rtl/ref.hxx>
+#include <list>
+#include <memory>
+#include <vector>
+
namespace framework
{
class ImageManagerImpl;
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index 4f069bb..3f3e362 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -64,7 +64,7 @@ struct PopupControllerEntry
::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider;
};
-typedef boost::unordered_map< OUString, PopupControllerEntry, OUStringHash, ::std::equal_to< OUString > > PopupControllerCache;
+typedef std::unordered_map< OUString, PopupControllerEntry, OUStringHash, std::equal_to< OUString > > PopupControllerCache;
class BmkMenu;
class AddonMenu;
diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx
index 58cfe48..5d47fc8 100644
--- a/framework/inc/uielement/menubarwrapper.hxx
+++ b/framework/inc/uielement/menubarwrapper.hxx
@@ -29,8 +29,6 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
-#include <boost/unordered_map.hpp>
-
namespace framework
{
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index c812d0c..4f1502a 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -41,7 +41,7 @@
#include <rtl/ustring.hxx>
#include <vcl/accel.hxx>
#include <vcl/menu.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace framework
{
@@ -86,7 +86,7 @@ namespace framework
OUString aImageId;
};
- typedef ::boost::unordered_map< int, AddInfo > AddInfoForId;
+ typedef std::unordered_map< int, AddInfo > AddInfoForId;
void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
void retrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg,
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 462f48e..90b68ac 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -52,6 +52,8 @@
#include <vcl/window.hxx>
#include <vcl/timer.hxx>
+#include <unordered_map>
+
class PopupMenu;
class ToolBox;
@@ -170,11 +172,11 @@ class ToolBarManager : public ToolbarManager_Base
bool RetrieveShortcut( const OUString& rCommandURL, OUString& rShortCut );
protected:
- typedef ::boost::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > > ToolBarControllerMap;
+ typedef std::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > > ToolBarControllerMap;
typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XSubToolbarController > > SubToolBarControllerVector;
typedef BaseHash< SubToolBarControllerVector > SubToolBarToSubToolBarControllerMap;
- typedef ::boost::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > MenuDescriptionMap;
+ typedef std::unordered_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > MenuDescriptionMap;
bool m_bDisposed : 1,
m_bSmallSymbols : 1,
diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx
index 112a1e8..c00507b 100644
--- a/framework/inc/uielement/uicommanddescription.hxx
+++ b/framework/inc/uielement/uicommanddescription.hxx
@@ -20,10 +20,8 @@
#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_UICOMMANDDESCRIPTION_HXX
#define INCLUDED_FRAMEWORK_INC_UIELEMENT_UICOMMANDDESCRIPTION_HXX
-#include <boost/unordered_map.hpp>
-
+#include <unordered_map>
#include <stdtypes.h>
-
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/frame/XModuleManager2.hpp>
@@ -84,15 +82,15 @@ private:
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
public:
- typedef ::boost::unordered_map< OUString,
- OUString,
- OUStringHash,
- ::std::equal_to< OUString > > ModuleToCommandFileMap;
-
- typedef ::boost::unordered_map< OUString,
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >,
- OUStringHash,
- ::std::equal_to< OUString > > UICommandsHashMap;
+ typedef std::unordered_map< OUString,
+ OUString,
+ OUStringHash,
+ std::equal_to< OUString > > ModuleToCommandFileMap;
+
+ typedef std::unordered_map< OUString,
+ css::uno::Reference< css::container::XNameAccess >,
+ OUStringHash,
+ std::equal_to< OUString > > UICommandsHashMap;
protected:
UICommandDescription( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext, bool );
diff --git a/framework/inc/uifactory/configurationaccessfactorymanager.hxx b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
index 365a443..2634923 100644
--- a/framework/inc/uifactory/configurationaccessfactorymanager.hxx
+++ b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
@@ -31,7 +31,7 @@
#include <cppuhelper/implbase1.hxx>
#include <rtl/ustring.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace framework {
@@ -57,10 +57,10 @@ namespace framework {
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- class FactoryManagerMap : public boost::unordered_map< OUString,
- OUString,
- OUStringHash,
- ::std::equal_to< OUString > >
+ class FactoryManagerMap : public std::unordered_map<OUString,
+ OUString,
+ OUStringHash,
+ std::equal_to< OUString > >
{
inline void free()
{
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx
index 2df76a2..d2313f4 100644
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -33,6 +33,7 @@
#include <cppuhelper/implbase1.hxx>
#include <rtl/ustring.hxx>
+#include <unordered_map>
// Namespace
@@ -73,10 +74,10 @@ private:
ControllerInfo(const OUString& _aImplementationName,const OUString& _aValue) : m_aImplementationName(_aImplementationName),m_aValue(_aValue){}
ControllerInfo(){}
};
- class MenuControllerMap : public boost::unordered_map< OUString,
+ class MenuControllerMap : public std::unordered_map< OUString,
ControllerInfo,
OUStringHash,
- ::std::equal_to< OUString > >
+ std::equal_to< OUString > >
{
inline void free()
{
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index b984ced..921f3eb 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -28,7 +28,7 @@
#include <rtl/ustring.hxx>
#include <cppuhelper/implbase1.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <stdtypes.h>
namespace framework{
@@ -108,10 +108,10 @@ class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper1< ::com::sun::s
private:
OUString getErrorLineString();
- class ImageHashMap : public ::boost::unordered_map< OUString ,
- Image_XML_Entry ,
- OUStringHash,
- ::std::equal_to< OUString > >
+ class ImageHashMap : public std::unordered_map< OUString ,
+ Image_XML_Entry ,
+ OUStringHash,
+ std::equal_to< OUString > >
{
public:
inline void free()
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index 8242874..dfe8ef9 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -27,7 +27,7 @@
#include <rtl/ustring.hxx>
#include <cppuhelper/implbase1.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <stdtypes.h>
#include <framework/fwedllapi.h>
@@ -104,10 +104,10 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler :
private:
OUString getErrorLineString();
- class StatusBarHashMap : public ::boost::unordered_map< OUString ,
- StatusBar_XML_Entry ,
- OUStringHash,
- ::std::equal_to< OUString > >
+ class StatusBarHashMap : public std::unordered_map<OUString ,
+ StatusBar_XML_Entry ,
+ OUStringHash,
+ std::equal_to< OUString > >
{
public:
inline void free()
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index 9e643fc..e50df10 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -109,10 +109,10 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler :
private:
OUString getErrorLineString();
- class ToolBoxHashMap : public ::boost::unordered_map< OUString ,
- ToolBox_XML_Entry ,
- OUStringHash,
- ::std::equal_to< OUString > >
+ class ToolBoxHashMap : public std::unordered_map<OUString ,
+ ToolBox_XML_Entry ,
+ OUStringHash,
+ std::equal_to< OUString > >
{
public:
inline void free()
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 0fd7091..95b096d 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -32,8 +32,8 @@
#include <vcl/graphicfilter.hxx>
#include <vcl/toolbox.hxx>
-#include <boost/unordered_map.hpp>
#include <algorithm>
+#include <unordered_map>
#include <vector>
// namespaces
@@ -234,10 +234,10 @@ class AddonsOptions_Impl : public ConfigItem
void addImage(ImageSize eSize, const Image &rImage, const OUString &rURL);
};
- typedef boost::unordered_map< OUString, ImageEntry, OUStringHash, ::std::equal_to< OUString > > ImageManager;
- typedef boost::unordered_map< OUString, sal_uInt32, OUStringHash, ::std::equal_to< OUString > > StringToIndexMap;
+ typedef std::unordered_map< OUString, ImageEntry, OUStringHash, std::equal_to< OUString > > ImageManager;
+ typedef std::unordered_map< OUString, sal_uInt32, OUStringHash, std::equal_to< OUString > > StringToIndexMap;
typedef std::vector< Sequence< Sequence< PropertyValue > > > AddonToolBars;
- typedef ::boost::unordered_map< OUString, MergeToolbarInstructionContainer, OUStringHash, ::std::equal_to< OUString > > ToolbarMergingInstructions;
+ typedef std::unordered_map< OUString, MergeToolbarInstructionContainer, OUStringHash, std::equal_to< OUString > > ToolbarMergingInstructions;
/*-****************************************************************************************************
@short return list of key names of our configuration management which represent oue module tree
diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx
index e9779f7..790ab0e 100644
--- a/framework/source/inc/accelerators/acceleratorcache.hxx
+++ b/framework/source/inc/accelerators/acceleratorcache.hxx
@@ -57,10 +57,10 @@ class AcceleratorCache
/** TODO document me
keys -> commands
*/
- typedef ::boost::unordered_map< css::awt::KeyEvent ,
- OUString ,
- KeyEventHashCode ,
- KeyEventEqualsFunc > TKey2Commands;
+ typedef std::unordered_map< css::awt::KeyEvent ,
+ OUString ,
+ KeyEventHashCode ,
+ KeyEventEqualsFunc > TKey2Commands;
// member
diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx
index 9d79e31..90670d4 100644
--- a/framework/source/inc/accelerators/keymapping.hxx
+++ b/framework/source/inc/accelerators/keymapping.hxx
@@ -55,10 +55,10 @@ class KeyMapping
typedef BaseHash< sal_Int16 > Identifier2CodeHash;
/** @short hash structure to map key codes to identifier. */
- typedef ::boost::unordered_map< sal_Int16 ,
- OUString ,
- ShortHashCode ,
- ::std::equal_to< sal_Int16 > > Code2IdentifierHash;
+ typedef std::unordered_map< sal_Int16 ,
+ OUString ,
+ ShortHashCode ,
+ std::equal_to< sal_Int16 > > Code2IdentifierHash;
// member
diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx
index 5662e49..3443184 100644
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@@ -56,10 +56,10 @@ class StorageHolder
};
/** @short TODO */
- typedef ::boost::unordered_map< OUString ,
- TStorageInfo ,
- OUStringHash ,
- ::std::equal_to< OUString > > TPath2StorageInfo;
+ typedef std::unordered_map< OUString ,
+ TStorageInfo ,
+ OUStringHash ,
+ std::equal_to< OUString > > TPath2StorageInfo;
// member
private:
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index b08b9f8..379551b 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -647,7 +647,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( co
if ( aURL.Protocol.equalsIgnoreAsciiCase(".uno:") )
aCommand = aURL.Path;
- // Make boost::unordered_map lookup if the current URL is in the disabled list
+ // Make std::unordered_map lookup if the current URL is in the disabled list
if ( m_aCommandOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, aCommand ) )
return css::uno::Reference< css::frame::XDispatch >();
else
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 519bf10..7e50b81 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -2215,7 +2215,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( cons
if ( aURL.Protocol.equalsIgnoreAsciiCase(".uno:") )
aCommand = aURL.Path;
- // Make boost::unordered_map lookup if the current URL is in the disabled list
+ // Make std::unordered_map lookup if the current URL is in the disabled list
if ( m_aCommandOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, aCommand ) )
return css::uno::Reference< css::frame::XDispatch >();
else
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 5057959..98e9b0f 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -50,7 +50,7 @@
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/util/XStringSubstitution.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <string.h>
using namespace com::sun::star::uno;
@@ -107,7 +107,7 @@ struct SubstituteRule
EnvironmentType aEnvType;
};
-typedef boost::unordered_map<OUString, SubstituteRule, OUStringHash>
+typedef std::unordered_map<OUString, SubstituteRule, OUStringHash>
SubstituteVariables;
typedef std::vector< SubstituteRule > SubstituteRuleVector;
@@ -282,7 +282,7 @@ protected:
throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
private:
- typedef boost::unordered_map<OUString, PreDefVariable, OUStringHash>
+ typedef std::unordered_map<OUString, PreDefVariable, OUStringHash>
VarNameToIndexMap;
VarNameToIndexMap m_aPreDefVarMap; // Mapping from pre-def variable names to enum for array access
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index 3fc7c9c..dd9c46e 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -73,10 +73,10 @@ struct TTabPageInfo
css::uno::Sequence< css::beans::NamedValue > m_lProperties;
};
-typedef ::boost::unordered_map< ::sal_Int32 ,
- TTabPageInfo ,
- Int32HashCode ,
- ::std::equal_to< ::sal_Int32 > > TTabPageInfoHash;
+typedef std::unordered_map< ::sal_Int32 ,
+ TTabPageInfo ,
+ Int32HashCode ,
+ std::equal_to< ::sal_Int32 > > TTabPageInfoHash;
/*-************************************************************************************************************
@short implements a helper service providing a dockable tab control window
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index 40ba097..9b5ee93 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -20,13 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_SOURCE_UICONFIGURATION_IMAGEMANAGERIMPL_HXX
#define INCLUDED_FRAMEWORK_SOURCE_UICONFIGURATION_IMAGEMANAGERIMPL_HXX
-/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
- with solaris headers ...
-*/
-#include <vector>
-#include <list>
-#include <boost/unordered_map.hpp>
-
#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
@@ -53,6 +46,10 @@
#include <rtl/ref.hxx>
#include <salhelper/simplereferenceobject.hxx>
+#include <list>
+#include <unordered_map>
+#include <vector>
+
namespace framework
{
class CmdImageList
@@ -137,10 +134,10 @@ namespace framework
void clear();
- typedef boost::unordered_map< OUString,
- sal_Bool,
- OUStringHash,
- ::std::equal_to< OUString > > ImageNameMap;
+ typedef std::unordered_map< OUString,
+ sal_Bool,
+ OUStringHash,
+ std::equal_to< OUString > > ImageNameMap;
enum Layer
{
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 658297f..49fd22c 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -39,7 +39,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <vcl/svapp.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
using namespace com::sun::star::uno;
using namespace com::sun::star::io;
@@ -92,7 +92,7 @@ public:
private:
virtual void SAL_CALL disposing() SAL_OVERRIDE;
- typedef ::boost::unordered_map< OUString, css::uno::Reference< css::ui::XModuleUIConfigurationManager2 >, OUStringHash, ::std::equal_to< OUString > > ModuleToModuleCfgMgr;
+ typedef std::unordered_map< OUString, css::uno::Reference< css::ui::XModuleUIConfigurationManager2 >, OUStringHash, std::equal_to< OUString > > ModuleToModuleCfgMgr;
//TODO_AS void impl_initStorages();
@@ -108,7 +108,7 @@ ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier( cons
{
try
{
- // Retrieve known modules and insert them into our boost::unordered_map to speed-up access time.
+ // Retrieve known modules and insert them into our unordered_map to speed-up access time.
Reference< XNameAccess > xNameAccess( m_xModuleMgr, UNO_QUERY_THROW );
const Sequence< OUString > aNameSeq = xNameAccess->getElementNames();
const OUString* pNameSeq = aNameSeq.getConstArray();
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 63e25a3..e4030b7 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -168,7 +168,7 @@ private:
css::uno::Reference< css::container::XIndexAccess > xSettings;
};
- typedef ::boost::unordered_map< OUString, UIElementData, OUStringHash, ::std::equal_to< OUString > > UIElementDataHashMap;
+ typedef std::unordered_map< OUString, UIElementData, OUStringHash, std::equal_to< OUString > > UIElementDataHashMap;
struct UIElementType
{
@@ -185,9 +185,9 @@ private:
css::uno::Reference< css::embed::XStorage > xStorage;
};
- typedef ::std::vector< UIElementType > UIElementTypesVector;
- typedef ::std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer;
- typedef ::boost::unordered_map< OUString, UIElementInfo, OUStringHash, ::std::equal_to< OUString > > UIElementInfoHashMap;
+ typedef std::vector< UIElementType > UIElementTypesVector;
+ typedef std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer;
+ typedef std::unordered_map< OUString, UIElementInfo, OUStringHash, std::equal_to< OUString > > UIElementInfoHashMap;
void impl_Initialize();
void implts_notifyContainerListener( const css::ui::ConfigurationEvent& aEvent, NotifyOp eOp );
@@ -397,7 +397,7 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer,
aUIElementData.bDefaultNode = false;
}
- // Create boost::unordered_map entries for all user interface elements inside the storage. We don't load the
+ // Create std::unordered_map entries for all user interface elements inside the storage. We don't load the
// settings to speed up the process.
rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData ));
}
@@ -517,7 +517,7 @@ ModuleUIConfigurationManager::UIElementData* ModuleUIConfigurationManager::impl
impl_preloadUIElementTypeList( LAYER_USERDEFINED, nElementType );
impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType );
- // first try to look into our user-defined vector/boost::unordered_map combination
+ // first try to look into our user-defined vector/unordered_map combination
UIElementDataHashMap& rUserHashMap = m_aUIElements[LAYER_USERDEFINED][nElementType].aElementsHashMap;
UIElementDataHashMap::iterator pIter = rUserHashMap.find( aResourceURL );
if ( pIter != rUserHashMap.end() )
@@ -531,7 +531,7 @@ ModuleUIConfigurationManager::UIElementData* ModuleUIConfigurationManager::impl
}
}
- // Not successful, we have to look into our default vector/boost::unordered_map combination
+ // Not successful, we have to look into our default vector/unordered_map combination
UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap;
pIter = rDefaultHashMap.find( aResourceURL );
if ( pIter != rDefaultHashMap.end() )
@@ -1547,7 +1547,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
// preload list of element types on demand
impl_preloadUIElementTypeList( LAYER_DEFAULT, nElementType );
- // Look into our default vector/boost::unordered_map combination
+ // Look into our default vector/unordered_map combination
UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap;
UIElementDataHashMap::iterator pIter = rDefaultHashMap.find( ResourceURL );
if ( pIter != rDefaultHashMap.end() )
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index bc25adf..44a1a37 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -39,7 +39,7 @@
#include <vcl/mnemonic.hxx>
#include <comphelper/sequence.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -101,10 +101,10 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper2<XNameAcces
bool fillCache();
private:
- typedef ::boost::unordered_map< OUString,
- OUString,
- OUStringHash,
- ::std::equal_to< OUString > > IdToInfoCache;
+ typedef std::unordered_map< OUString,
+ OUString,
+ OUStringHash,
+ std::equal_to< OUString > > IdToInfoCache;
bool initializeConfigAccess();
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 3bb30e4..2e720de 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -46,7 +46,7 @@
#include <rtl/ref.hxx>
#include <rtl/ustrbuf.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
using namespace com::sun::star::uno;
using namespace com::sun::star::io;
@@ -150,7 +150,7 @@ private:
struct UIElementType;
friend struct UIElementType;
- typedef ::boost::unordered_map< OUString, UIElementData, OUStringHash, ::std::equal_to< OUString > > UIElementDataHashMap;
+ typedef std::unordered_map< OUString, UIElementData, OUStringHash, std::equal_to< OUString > > UIElementDataHashMap;
struct UIElementType
{
@@ -167,9 +167,9 @@ private:
css::uno::Reference< css::embed::XStorage > xStorage;
};
- typedef ::std::vector< UIElementType > UIElementTypesVector;
- typedef ::std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer;
- typedef ::boost::unordered_map< OUString, UIElementInfo, OUStringHash, ::std::equal_to< OUString > > UIElementInfoHashMap;
+ typedef std::vector< UIElementType > UIElementTypesVector;
+ typedef std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer;
+ typedef std::unordered_map< OUString, UIElementInfo, OUStringHash, std::equal_to< OUString > > UIElementInfoHashMap;
void impl_Initialize();
void implts_notifyContainerListener( const css::ui::ConfigurationEvent& aEvent, NotifyOp eOp );
@@ -315,7 +315,7 @@ void UIConfigurationManager::impl_preloadUIElementTypeList( sal_Int16 nElementTy
aUIElementData.bModified = false;
aUIElementData.bDefault = false;
- // Create boost::unordered_map entries for all user interface elements inside the storage. We don't load the
+ // Create unordered_map entries for all user interface elements inside the storage. We don't load the
// settings to speed up the process.
rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData ));
}
@@ -434,7 +434,7 @@ UIConfigurationManager::UIElementData* UIConfigurationManager::impl_findUIElemen
// preload list of element types on demand
impl_preloadUIElementTypeList( nElementType );
- // try to look into our document vector/boost::unordered_map combination
+ // try to look into our document vector/unordered_map combination
UIElementDataHashMap& rUserHashMap = m_aUIElements[nElementType].aElementsHashMap;
UIElementDataHashMap::iterator pIter = rUserHashMap.find( aResourceURL );
if ( pIter != rUserHashMap.end() )
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 50d9586..a6dee5c 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -42,8 +42,8 @@
#include <cppuhelper/supportsservice.hxx>
#include <tools/debug.hxx>
+#include <unordered_map>
#include <vector>
-#include <boost/unordered_map.hpp>
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -215,10 +215,10 @@ class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper2< XNameCo
bool impl_initializeConfigAccess();
private:
- typedef ::boost::unordered_map< OUString,
- WindowStateInfo,
- OUStringHash,
- ::std::equal_to< OUString > > ResourceURLToInfoCache;
+ typedef std::unordered_map< OUString,
+ WindowStateInfo,
+ OUStringHash,
+ std::equal_to< OUString > > ResourceURLToInfoCache;
osl::Mutex m_aMutex;
OUString m_aConfigWindowAccess;
@@ -1320,15 +1320,15 @@ public:
virtual sal_Bool SAL_CALL hasElements()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- typedef ::boost::unordered_map< OUString,
- OUString,
- OUStringHash,
- ::std::equal_to< OUString > > ModuleToWindowStateFileMap;
+ typedef std::unordered_map< OUString,
+ OUString,
+ OUStringHash,
+ std::equal_to< OUString > > ModuleToWindowStateFileMap;
- typedef ::boost::unordered_map< OUString,
- css::uno::Reference< css::container::XNameAccess >,
- OUStringHash,
- ::std::equal_to< OUString > > ModuleToWindowStateConfigHashMap;
+ typedef std::unordered_map< OUString,
+ css::uno::Reference< css::container::XNameAccess >,
+ OUStringHash,
+ std::equal_to< OUString > > ModuleToWindowStateConfigHashMap;
private:
css::uno::Reference< css::uno::XComponentContext> m_xContext;
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 514e373..2d48f92 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -221,10 +221,10 @@ private:
virtual void impl_setPopupMenu() SAL_OVERRIDE;
virtual void impl_select(const uno::Reference< frame::XDispatch >& _xDispatch,const util::URL& aURL) SAL_OVERRIDE;
- class UrlToDispatchMap : public ::boost::unordered_map< OUString,
- uno::Reference< frame::XDispatch >,
- OUStringHash,
- ::std::equal_to< OUString > >
+ class UrlToDispatchMap : public std::unordered_map< OUString,
+ uno::Reference< frame::XDispatch >,
+ OUStringHash,
+ std::equal_to< OUString > >
{
public:
inline void free()
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 08a787d..3abad04 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -339,7 +339,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup
AddInfo aAddInfo;
// retrieve additional parameters from bookmark menu and
- // store it in a boost::unordered_map.
+ // store it in a unordered_map.
for ( sal_uInt16 i = 0; i < pSubMenu->GetItemCount(); i++ )
{
sal_uInt16 nItemId = pSubMenu->GetItemId( sal::static_int_cast<sal_uInt16>( i ) );
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index ac16ea6..1972713 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -82,7 +82,7 @@ static const char STATIC_INTERNAL_CMD_PART[] = ".cmd:";
namespace framework
{
-typedef boost::unordered_map< OUString, OUString, OUStringHash, ::std::equal_to< OUString > > ToolbarHashMap;
+typedef std::unordered_map< OUString, OUString, OUStringHash, std::equal_to< OUString > > ToolbarHashMap;
struct ToolBarEntry
{
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index cafd7a4..b83e31c 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -140,10 +140,10 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
std::vector< OUString >& aImageMirrorVector);
private:
- typedef ::boost::unordered_map< OUString,
- CmdToInfoMap,
- OUStringHash,
- ::std::equal_to< OUString > > CommandToInfoCache;
+ typedef std::unordered_map< OUString,
+ CmdToInfoMap,
+ OUStringHash,
+ std::equal_to< OUString > > CommandToInfoCache;
bool initializeConfigAccess();
diff --git a/helpcompiler/inc/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx
index b66248e..e686c74 100644
--- a/helpcompiler/inc/HelpCompiler.hxx
+++ b/helpcompiler/inc/HelpCompiler.hxx
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <string>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <vector>
#include <list>
#include <fstream>
@@ -154,11 +154,11 @@ struct joaat_hash
#define pref_hash joaat_hash
-typedef boost::unordered_map<std::string, std::string, pref_hash> Stringtable;
+typedef std::unordered_map<std::string, std::string, pref_hash> Stringtable;
typedef std::list<std::string> LinkedList;
typedef std::vector<std::string> HashSet;
-typedef boost::unordered_map<std::string, LinkedList, pref_hash> Hashtable;
+typedef std::unordered_map<std::string, LinkedList, pref_hash> Hashtable;
class StreamTable
{
diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx
index b285293..cb3d6a6 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -177,7 +177,7 @@ void writeKeyValue_DBHelp( FILE* pFile, const std::string& aKeyStr, const std::s
class HelpKeyword
{
private:
- typedef boost::unordered_map<std::string, Data, pref_hash> DataHashtable;
+ typedef std::unordered_map<std::string, Data, pref_hash> DataHashtable;
DataHashtable _hash;
public:
diff --git a/idlc/inc/idlc/idlctypes.hxx b/idlc/inc/idlc/idlctypes.hxx
index 7766f83..e9e4c0c 100644
--- a/idlc/inc/idlc/idlctypes.hxx
+++ b/idlc/inc/idlc/idlctypes.hxx
@@ -21,11 +21,11 @@
#include <stdio.h>
-#include <boost/unordered_map.hpp>
#include <list>
-#include <vector>
-#include <string>
#include <set>
+#include <string>
+#include <unordered_map>
+#include <vector>
#include <sal/types.h>
#include <rtl/ustring.hxx>
@@ -44,8 +44,8 @@ typedef ::std::set< OString, LessString > StringSet;
class AstDeclaration;
-typedef ::boost::unordered_map< OString, AstDeclaration*, OStringHash > DeclMap;
-typedef ::std::list< AstDeclaration* > DeclList;
+typedef std::unordered_map< OString, AstDeclaration*, OStringHash > DeclMap;
+typedef std::list< AstDeclaration* > DeclList;
class AstScope;
AstDeclaration* SAL_CALL scopeAsDecl(AstScope* pScope);
diff --git a/idlc/inc/idlc/options.hxx b/idlc/inc/idlc/options.hxx
index 08d839e..ccd2d01 100644
--- a/idlc/inc/idlc/options.hxx
+++ b/idlc/inc/idlc/options.hxx
@@ -22,7 +22,7 @@
#include <idlc/idlctypes.hxx>
-typedef ::boost::unordered_map< OString,
+typedef std::unordered_map< OString,
OString,
OStringHash > OptionMap;
diff --git a/idlc/source/idlc.cxx b/idlc/source/idlc.cxx
index f6a4495..27cb47d 100644
--- a/idlc/source/idlc.cxx
+++ b/idlc/source/idlc.cxx
@@ -38,6 +38,8 @@
#include <osl/file.hxx>
#include <osl/thread.h>
+#include <algorithm>
+
AstDeclaration* SAL_CALL scopeAsDecl(AstScope* pScope)
{
if (pScope == NULL) return NULL;
diff --git a/include/basic/codecompletecache.hxx b/include/basic/codecompletecache.hxx
index 3721b96..dad54f0 100644
--- a/include/basic/codecompletecache.hxx
+++ b/include/basic/codecompletecache.hxx
@@ -24,14 +24,14 @@
#include <basic/sbxobj.hxx>
#include <basic/sbxdef.hxx>
#include <boost/utility.hpp>
-#include <boost/unordered_map.hpp>
#include <rtl/ustring.hxx>
#include <svtools/miscopt.hxx>
+#include <unordered_map>
#include <vector>
-typedef boost::unordered_map< OUString, OUString, OUStringHash > CodeCompleteVarTypes;
+typedef std::unordered_map< OUString, OUString, OUStringHash > CodeCompleteVarTypes;
/* variable name, type */
-typedef boost::unordered_map< OUString, CodeCompleteVarTypes, OUStringHash > CodeCompleteVarScopes;
+typedef std::unordered_map< OUString, CodeCompleteVarTypes, OUStringHash > CodeCompleteVarScopes;
/* procedure, CodeCompleteVarTypes */
class BASIC_DLLPUBLIC CodeCompleteOptions
diff --git a/include/codemaker/generatedtypeset.hxx b/include/codemaker/generatedtypeset.hxx
index ee27e6f..cbe5dc3 100644
--- a/include/codemaker/generatedtypeset.hxx
+++ b/include/codemaker/generatedtypeset.hxx
@@ -22,7 +22,7 @@
#include <rtl/string.hxx>
-#include <boost/unordered_set.hpp>
+#include <unordered_set>
/// @HTML
@@ -63,7 +63,7 @@ private:
GeneratedTypeSet(GeneratedTypeSet &); // not implemented
void operator =(const GeneratedTypeSet&); // not implemented
- boost::unordered_set< OString, OStringHash > m_set;
+ std::unordered_set< OString, OStringHash > m_set;
};
}
diff --git a/include/codemaker/options.hxx b/include/codemaker/options.hxx
index d322a74..2d7ddbf 100644
--- a/include/codemaker/options.hxx
+++ b/include/codemaker/options.hxx
@@ -20,11 +20,10 @@
#ifndef INCLUDED_CODEMAKER_OPTIONS_HXX
#define INCLUDED_CODEMAKER_OPTIONS_HXX
-#include <boost/unordered_map.hpp>
-
#include <codemaker/global.hxx>
+#include <unordered_map>
-typedef ::boost::unordered_map
+typedef std::unordered_map
<
::rtl::OString,
::rtl::OString,
diff --git a/include/filter/msfilter/svxmsbas.hxx b/include/filter/msfilter/svxmsbas.hxx
index 22853fb..10ea120 100644
--- a/include/filter/msfilter/svxmsbas.hxx
+++ b/include/filter/msfilter/svxmsbas.hxx
@@ -25,7 +25,7 @@
#include <sot/storage.hxx>
#include <map>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
class SfxObjectShell;
@@ -44,7 +44,7 @@ class SfxObjectShell;
* probably what the user expects to see when viewing the code
*/
-typedef boost::unordered_map< sal_Int32, OUString > ObjIdToName;
+typedef std::unordered_map< sal_Int32, OUString > ObjIdToName;
typedef std::map< OUString, ObjIdToName > ControlAttributeInfo;
diff --git a/include/framework/titlehelper.hxx b/include/framework/titlehelper.hxx
index 839e57c..63d86e5 100644
--- a/include/framework/titlehelper.hxx
+++ b/include/framework/titlehelper.hxx
@@ -40,7 +40,6 @@
#include <rtl/ustrbuf.hxx>
-#include <boost/unordered_map.hpp>
#include <framework/fwedllapi.h>
diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx
index 4560bb4..3d56047 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -26,8 +26,6 @@
#include <oox/token/tokens.hxx>
#include <sax/fshelper.hxx>
#include <vcl/mapmod.hxx>
-#include <boost/unordered_map.hpp>
-#include <map>
namespace com { namespace sun { namespace star {
namespace chart {
diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index 6403aec..b754b67 100644
--- a/include/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
@@ -26,7 +26,7 @@
#include <sax/fshelper.hxx>
#include <vcl/mapmod.hxx>
#include <tools/fract.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace com { namespace sun { namespace star {
namespace beans {
@@ -58,7 +58,7 @@ private:
};
public:
- typedef boost::unordered_map< const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>, sal_Int32, ShapeHash, ShapeCheck> ShapeHashMap;
+ typedef std::unordered_map< const css::uno::Reference< css::drawing::XShape>, sal_Int32, ShapeHash, ShapeCheck> ShapeHashMap;
protected:
sal_Int32 mnShapeIdMax, mnPictureIdMax;
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index 4123a78..ba3d491 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.hxx
@@ -31,8 +31,8 @@
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <boost/unordered_map.hpp>
#include <map>
+#include <unordered_map>
#include <boost/optional.hpp>
class SvBorder;
@@ -210,27 +210,27 @@ public:
private:
static Theme& GetCurrentTheme();
- ::std::vector<Image> maImages;
- ::std::vector<Color> maColors;
- ::std::vector<Paint> maPaints;
- ::std::vector<sal_Int32> maIntegers;
- ::std::vector<bool> maBooleans;
- ::std::vector<Rectangle> maRectangles;
+ std::vector<Image> maImages;
+ std::vector<Color> maColors;
+ std::vector<Paint> maPaints;
+ std::vector<sal_Int32> maIntegers;
+ std::vector<bool> maBooleans;
+ std::vector<Rectangle> maRectangles;
bool mbIsHighContrastMode;
bool mbIsHighContrastModeSetManually;
- typedef ::boost::unordered_map<rtl::OUString,ThemeItem, rtl::OUStringHash> PropertyNameToIdMap;
+ typedef std::unordered_map<rtl::OUString,ThemeItem, rtl::OUStringHash> PropertyNameToIdMap;
PropertyNameToIdMap maPropertyNameToIdMap;
- typedef ::std::vector<rtl::OUString> PropertyIdToNameMap;
+ typedef std::vector<rtl::OUString> PropertyIdToNameMap;
PropertyIdToNameMap maPropertyIdToNameMap;
typedef ::std::vector<css::uno::Any> RawValueContainer;
RawValueContainer maRawValues;
- typedef ::std::vector<css::uno::Reference<css::beans::XPropertyChangeListener> > ChangeListenerContainer;
- typedef ::std::map<ThemeItem,ChangeListenerContainer> ChangeListeners;
+ typedef std::vector<css::uno::Reference<css::beans::XPropertyChangeListener> > ChangeListenerContainer;
+ typedef std::map<ThemeItem,ChangeListenerContainer> ChangeListeners;
ChangeListeners maChangeListeners;
- typedef ::std::vector<css::uno::Reference<css::beans::XVetoableChangeListener> > VetoableListenerContainer;
- typedef ::std::map<ThemeItem,VetoableListenerContainer> VetoableListeners;
+ typedef std::vector<css::uno::Reference<css::beans::XVetoableChangeListener> > VetoableListenerContainer;
+ typedef std::map<ThemeItem,VetoableListenerContainer> VetoableListeners;
VetoableListeners maVetoableListeners;
enum PropertyType
diff --git a/include/svl/IndexedStyleSheets.hxx b/include/svl/IndexedStyleSheets.hxx
index 8cd8de4..7fcbfae 100644
--- a/include/svl/IndexedStyleSheets.hxx
+++ b/include/svl/IndexedStyleSheets.hxx
@@ -18,7 +18,7 @@
#include <svl/svldllapi.h>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <vector>
class SfxStyleSheetBase;
@@ -178,7 +178,7 @@ private:
*
* @internal
* Must be an unordered map. A regular map is too slow for some files. */
- typedef boost::unordered_multimap<rtl::OUString, unsigned, rtl::OUStringHash> MapType;
+ typedef std::unordered_multimap<rtl::OUString, unsigned, rtl::OUStringHash> MapType;
/** A map which stores the positions of style sheets by their name */
MapType mPositionsByName;
diff --git a/include/svl/listener.hxx b/include/svl/listener.hxx
index 8b47fda..a148c95 100644
--- a/include/svl/listener.hxx
+++ b/include/svl/listener.hxx
@@ -21,14 +21,14 @@
#include <svl/svldllapi.h>
-#include <boost/unordered_set.hpp>
+#include <unordered_set>
class SvtBroadcaster;
class SfxHint;
class SVL_DLLPUBLIC SvtListener
{
- typedef boost::unordered_set<SvtBroadcaster*> BroadcastersType;
+ typedef std::unordered_set<SvtBroadcaster*> BroadcastersType;
BroadcastersType maBroadcasters;
const SvtListener& operator=(const SvtListener &); // n.i., ist verboten
diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx
index 22babad..d585ec4 100644
--- a/include/svtools/framestatuslistener.hxx
+++ b/include/svtools/framestatuslistener.hxx
@@ -31,7 +31,7 @@
#include <cppuhelper/interfacecontainer.hxx>
#include <comphelper/broadcasthelper.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace svt
{
@@ -82,10 +82,10 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
};
- typedef ::boost::unordered_map< OUString,
- com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >,
- OUStringHash,
- ::std::equal_to< OUString > > URLToDispatchMap;
+ typedef std::unordered_map< OUString,
+ css::uno::Reference< css::frame::XDispatch >,
+ OUStringHash,
+ std::equal_to< OUString > > URLToDispatchMap;
bool m_bInitialized : 1,
m_bDisposed : 1;
diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx
index 1101d2c..ece18a3 100644
--- a/include/svtools/statusbarcontroller.hxx
+++ b/include/svtools/statusbarcontroller.hxx
@@ -31,10 +31,8 @@
#include <cppuhelper/weak.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <comphelper/broadcasthelper.hxx>
-
-#include <boost/unordered_map.hpp>
-
#include <tools/gen.hxx>
+#include <unordered_map>
namespace svt
{
@@ -103,10 +101,10 @@ class SVT_DLLPUBLIC StatusbarController :
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
};
- typedef ::boost::unordered_map< OUString,
- com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >,
- OUStringHash,
- ::std::equal_to< OUString > > URLToDispatchMap;
+ typedef std::unordered_map< OUString,
+ css::uno::Reference< css::frame::XDispatch >,
+ OUStringHash,
+ std::equal_to< OUString > > URLToDispatchMap;
// methods to support status forwarder, known by the old sfx2 toolbox controller implementation
void addStatusListener( const OUString& aCommandURL );
diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx
index 352a645..fb61f21 100644
--- a/include/svtools/toolboxcontroller.hxx
+++ b/include/svtools/toolboxcontroller.hxx
@@ -39,7 +39,7 @@
#include <cppuhelper/propshlp.hxx>
#include <tools/link.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
class ToolBox;
@@ -151,10 +151,10 @@ class SVT_DLLPUBLIC ToolboxController :
DECL_STATIC_LINK( ToolboxController, ExecuteHdl_Impl, DispatchInfo* );
- typedef ::boost::unordered_map< OUString,
- com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >,
- OUStringHash,
- ::std::equal_to< OUString > > URLToDispatchMap;
+ typedef std::unordered_map< OUString,
+ css::uno::Reference< css::frame::XDispatch >,
+ OUStringHash,
+ std::equal_to< OUString > > URLToDispatchMap;
// methods to support status forwarder, known by the old sfx2 toolbox controller implementation
void addStatusListener( const OUString& aCommandURL );
diff --git a/include/svx/ShapeTypeHandler.hxx b/include/svx/ShapeTypeHandler.hxx
index 7a37297..ee84c34 100644
--- a/include/svx/ShapeTypeHandler.hxx
+++ b/include/svx/ShapeTypeHandler.hxx
@@ -30,8 +30,8 @@
#include <svx/svxdllapi.h>
#include <rtl/ustring.hxx>
+#include <unordered_map>
#include <vector>
-#include <boost/unordered_map.hpp>
namespace accessibility {
@@ -184,9 +184,8 @@ private:
/** This hash map allows the fast look up of a type descriptor for a
given service name.
*/
- typedef ::boost::unordered_map<
- OUString,ShapeTypeId,
- OUStringHash> tServiceNameToSlotId;
+ typedef std::unordered_map<OUString,ShapeTypeId,
+ OUStringHash> tServiceNameToSlotId;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list