diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-01-01 19:58:59 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-02 16:14:36 +0000 |
| commit | fd1372ba8b1c3eb3c7fad6d9c623176c8071f31b (patch) | |
| tree | 448f0d04f780007b3eeeb76b7c4c8c54cbfd6d9b /cui | |
| parent | c48b928acab9f226ad5ad816fe773c21051431e8 (diff) | |
boost::unordered_map->std::unordered_map
you can get debug stl this way
Change-Id: Ia70a3e7c7c452390e8bee34975d296c9318e4a19
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/cfg.cxx | 14 | ||||
| -rw-r--r-- | cui/source/inc/macropg.hxx | 5 | ||||
| -rw-r--r-- | cui/source/inc/scriptdlg.hxx | 6 |
3 files changed, 11 insertions, 14 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 328f8bf7207f..c3d32dd96881 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 f151c36ba6e7..c1cded175f5e 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 a3d3f0df267b..0a734a9d2f84 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; |