diff options
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/cctrl/checklistmenu.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh6.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh8.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/docshell/macromgr.cxx | 5 | ||||
-rw-r--r-- | sc/source/ui/inc/checklistmenu.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/crnrdlg.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/docsh.hxx | 5 | ||||
-rw-r--r-- | sc/source/ui/inc/gridwin.hxx | 3 | ||||
-rw-r--r-- | sc/source/ui/inc/pvfundlg.hxx | 8 | ||||
-rw-r--r-- | sc/source/ui/unoobj/cellsuno.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/unoobj/chart2uno.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/unoobj/linkuno.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/vba/vbachartobjects.hxx | 7 | ||||
-rw-r--r-- | sc/source/ui/vba/vbawindow.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/vba/vbawindows.cxx | 7 | ||||
-rw-r--r-- | sc/source/ui/vba/vbaworkbooks.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/view/dbfunc3.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin2.cxx | 5 |
19 files changed, 42 insertions, 56 deletions
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index c3ad4d87d4b7..3c932256cf33 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -38,7 +38,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::accessibility::XAccessible; using ::com::sun::star::accessibility::XAccessibleContext; using ::std::vector; -using ::boost::unordered_map; ScMenuFloatingWindow::MenuItemData::MenuItemData() : mbEnabled(true), mbSeparator(false), diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index e4cd4b53515d..92b6e2a5dc8e 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -342,7 +342,7 @@ void ScDocShell::ReconnectDdeLink(SfxObjectShell& rServer) void ScDocShell::UpdateLinks() { - typedef boost::unordered_set<OUString, OUStringHash> StrSetType; + typedef std::unordered_set<OUString, OUStringHash> StrSetType; sfx2::LinkManager* pLinkManager = aDocument.GetLinkManager(); StrSetType aNames; diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index e8e5f46db007..f7f7f0f09997 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -75,8 +75,8 @@ #include "docparam.hxx" #include "cellvalue.hxx" +#include <unordered_set> #include <vector> -#include <boost/unordered_set.hpp> using namespace com::sun::star; using ::std::vector; @@ -493,7 +493,7 @@ void lcl_GetColumnTypes( SCCOL nLastCol = rDataRange.aEnd.Col(); SCROW nLastRow = rDataRange.aEnd.Row(); - typedef boost::unordered_set<OUString, OUStringHash> StrSetType; + typedef std::unordered_set<OUString, OUStringHash> StrSetType; StrSetType aFieldNames; long nField = 0; diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx index 1a6201e10319..31e205e56ca4 100644 --- a/sc/source/ui/docshell/macromgr.cxx +++ b/sc/source/ui/docshell/macromgr.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::Reference; -using ::boost::unordered_map; using ::std::list; using ::std::for_each; using ::std::pair; @@ -86,7 +85,7 @@ public: } private: - typedef boost::unordered_map<OUString, list<ScFormulaCell*>, OUStringHash> ModuleCellMap; + typedef std::unordered_map<OUString, list<ScFormulaCell*>, OUStringHash> ModuleCellMap; ModuleCellMap maCells; }; @@ -126,7 +125,7 @@ public: void ScMacroManager::InitUserFuncData() { - // Clear boost::unordered_map + // Clear unordered_map mhFuncToVolatile.clear(); OUString sProjectName("Standard"); diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index aa2adc004049..5e3cc183ad74 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -16,8 +16,8 @@ #include <vcl/timer.hxx> #include <svx/checklbx.hxx> -#include <boost/unordered_map.hpp> #include <boost/scoped_ptr.hpp> +#include <unordered_map> namespace com { namespace sun { namespace star { @@ -212,7 +212,7 @@ class ScCheckListBox : public SvTreeListBox class ScCheckListMenuWindow : public ScMenuFloatingWindow { public: - typedef boost::unordered_map<OUString, bool, OUStringHash> ResultType; + typedef std::unordered_map<OUString, bool, OUStringHash> ResultType; /** * Extended data that the client code may need to store. Create a diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index be92e60efdad..b2d97ab9035d 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -25,7 +25,7 @@ #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> class ScViewData; class ScDocument; @@ -64,7 +64,7 @@ private: ScRangePairListRef xColNameRanges; ScRangePairListRef xRowNameRanges; - typedef ::boost::unordered_map< OUString, ScRange, OUStringHash > NameRangeMap; + typedef std::unordered_map< OUString, ScRange, OUStringHash > NameRangeMap; NameRangeMap aRangeMap; ScViewData* pViewData; ScDocument* pDoc; diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index fc6bccc2bc31..1f4793daff18 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -35,11 +35,10 @@ #include "optutil.hxx" #include "docuno.hxx" -#include <boost/unordered_map.hpp> #include <boost/scoped_ptr.hpp> #include <cppuhelper/implbase1.hxx> - #include <config_telepathy.h> +#include <unordered_map> class ScRefreshTimerProtector; class ScEditEngineDefaulter; @@ -73,7 +72,7 @@ class ScCollaboration; namespace sfx2 { class FileDialogHelper; } struct DocShell_Impl; -typedef ::boost::unordered_map< sal_uLong, sal_uLong > ScChangeActionMergeMap; +typedef std::unordered_map< sal_uLong, sal_uLong > ScChangeActionMergeMap; //enum ScDBFormat { SC_FORMAT_SDF, SC_FORMAT_DBF }; diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 05f99946a4b9..fe43cf2d0385 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -28,11 +28,10 @@ #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <vector> #include <boost/scoped_ptr.hpp> -#include <boost/unordered_map.hpp> #include <boost/ptr_container/ptr_map.hpp> #include <boost/ptr_container/ptr_vector.hpp> +#include <vector> namespace editeng { struct MisspellRanges; diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 0db4dfa56838..8a0fc1b750e0 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -36,7 +36,7 @@ #include "pivot.hxx" #include <boost/scoped_ptr.hpp> -#include <boost/unordered_map.hpp> +#include <unordered_map> typedef sfx::ListBoxWrapper< sal_Int32 > ScDPListBoxWrapper; @@ -56,7 +56,7 @@ private: class ScDPFunctionDlg : public ModalDialog { - typedef ::boost::unordered_map< OUString, OUString, OUStringHash > NameMapType; + typedef std::unordered_map< OUString, OUString, OUStringHash > NameMapType; public: explicit ScDPFunctionDlg( vcl::Window* pParent, const ScDPLabelDataVector& rLabelVec, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ); @@ -178,7 +178,7 @@ private: ScDPObject& mrDPObj; /// The DataPilot object (for member names). ScDPLabelData maLabelData; /// Cache for members data. - typedef ::boost::unordered_map<OUString, ScDPName, OUStringHash> NameMapType; + typedef std::unordered_map<OUString, ScDPName, OUStringHash> NameMapType; NameMapType maDataFieldNameMap; /// Cache for displayed name to field name mapping. }; @@ -203,7 +203,7 @@ private: ListBox* mpLbDims; OKButton* mpBtnOk; - typedef ::boost::unordered_map<OUString, long, OUStringHash> DimNameIndexMap; + typedef std::unordered_map<OUString, long, OUStringHash> DimNameIndexMap; DimNameIndexMap maNameIndexMap; ScDPObject& mrDPObj; }; diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index e005375bff36..6ec3abeecb8e 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -9478,9 +9478,9 @@ struct ScPatternHashCode }; // Hash map to find a range by its start row -typedef ::boost::unordered_map< SCROW, ScRange > ScRowRangeHashMap; +typedef std::unordered_map< SCROW, ScRange > ScRowRangeHashMap; -typedef ::std::vector<ScRange> ScRangeVector; +typedef std::vector<ScRange> ScRangeVector; // Hash map entry. // The Join method depends on the column-wise order of ScAttrRectIterator @@ -9591,7 +9591,7 @@ const ScRangeList& ScUniqueFormatsEntry::GetRanges() return *aReturnRanges; } -typedef ::boost::unordered_map< const ScPatternAttr*, ScUniqueFormatsEntry, ScPatternHashCode > ScUniqueFormatsHashMap; +typedef std::unordered_map< const ScPatternAttr*, ScUniqueFormatsEntry, ScPatternHashCode > ScUniqueFormatsHashMap; // function object to sort the range lists by start of first range struct ScUniqueFormatsOrder diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index cb944ee802b3..297e95640ccd 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -2792,8 +2792,8 @@ void ScChart2DataSequence::StopListeningToAllExternalRefs() if (!m_pExtRefListener.get()) return; - const boost::unordered_set<sal_uInt16>& rFileIds = m_pExtRefListener->getAllFileIds(); - boost::unordered_set<sal_uInt16>::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end(); + const std::unordered_set<sal_uInt16>& rFileIds = m_pExtRefListener->getAllFileIds(); + std::unordered_set<sal_uInt16>::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end(); ScExternalRefManager* pRefMgr = m_pDocument->GetExternalRefManager(); for (; itr != itrEnd; ++itr) pRefMgr->removeLinkListener(*itr, m_pExtRefListener.get()); @@ -2825,8 +2825,8 @@ void ScChart2DataSequence::CopyData(const ScChart2DataSequence& r) ScExternalRefManager* pRefMgr = m_pDocument->GetExternalRefManager(); m_pExtRefListener.reset(new ExternalRefListener(*this, m_pDocument)); - const boost::unordered_set<sal_uInt16>& rFileIds = r.m_pExtRefListener->getAllFileIds(); - boost::unordered_set<sal_uInt16>::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end(); + const std::unordered_set<sal_uInt16>& rFileIds = r.m_pExtRefListener->getAllFileIds(); + std::unordered_set<sal_uInt16>::const_iterator itr = rFileIds.begin(), itrEnd = rFileIds.end(); for (; itr != itrEnd; ++itr) { pRefMgr->addLinkListener(*itr, m_pExtRefListener.get()); diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 5833e33ca691..ce3619708cfd 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -406,7 +406,7 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex) if (!pDocShell) return NULL; - typedef boost::unordered_set<OUString, OUStringHash> StrSetType; + typedef std::unordered_set<OUString, OUStringHash> StrSetType; StrSetType aNames; ScDocument& rDoc = pDocShell->GetDocument(); SCTAB nTabCount = rDoc.GetTableCount(); @@ -453,7 +453,6 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByName_Impl(const OUString& aName) } // XEnumerationAccess - uno::Reference<container::XEnumeration> SAL_CALL ScSheetLinksObj::createEnumeration() throw(uno::RuntimeException, std::exception) { @@ -462,10 +461,9 @@ uno::Reference<container::XEnumeration> SAL_CALL ScSheetLinksObj::createEnumerat } // XIndexAccess - sal_Int32 SAL_CALL ScSheetLinksObj::getCount() throw(uno::RuntimeException, std::exception) { - typedef boost::unordered_set<OUString, OUStringHash> StrSetType; + typedef std::unordered_set<OUString, OUStringHash> StrSetType; SolarMutexGuard aGuard; if (!pDocShell) @@ -551,7 +549,7 @@ sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const OUString& aName ) uno::Sequence<OUString> SAL_CALL ScSheetLinksObj::getElementNames() throw(uno::RuntimeException, std::exception) { - typedef boost::unordered_set<OUString, OUStringHash> StrSetType; + typedef std::unordered_set<OUString, OUStringHash> StrSetType; SolarMutexGuard aGuard; // Name ist der Dateiname diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx index 4ca84fba85d9..810d6474a1a3 100644 --- a/sc/source/ui/vba/vbachartobjects.hxx +++ b/sc/source/ui/vba/vbachartobjects.hxx @@ -29,15 +29,8 @@ #include <com/sun/star/container/XEnumerationAccess.hpp> #include <vbahelper/vbacollectionimpl.hxx> #include "excelvbahelper.hxx" -#include <boost/unordered_map.hpp> typedef CollTestImplHelper< ov::excel::XChartObjects > ChartObjects_BASE; -/* #TODO see if this hash table is 'really' necessary -typedef ::boost::unordered_map< OUString, -css::uno::Reference< ov::excel::XChartObject >, - OUStringHash, - ::std::equal_to< OUString > > aHashTable; -*/ class ScVbaChartObjects : public ChartObjects_BASE { diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 53942a7c5746..8f0168e93e66 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -38,17 +38,17 @@ #include <tabvwsh.hxx> #include <docuno.hxx> #include <sc.hrc> -#include <boost/unordered_map.hpp> #include <sfx2/viewfrm.hxx> #include <vcl/wrkwin.hxx> #include "unonames.hxx" #include "markdata.hxx" +#include <unordered_map> using namespace ::com::sun::star; using namespace ::ooo::vba; using namespace ::ooo::vba::excel::XlWindowState; -typedef boost::unordered_map< OUString, +typedef std::unordered_map< OUString, SCTAB, OUStringHash, ::std::equal_to< OUString > > NameIndexHash; diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index 25928acfea89..e70809a51f88 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -18,7 +18,6 @@ */ #include "vbawindows.hxx" -#include <boost/unordered_map.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/frame/Desktop.hpp> @@ -27,12 +26,14 @@ #include "vbawindow.hxx" #include "vbaglobals.hxx" +#include <unordered_map> + using namespace ::com::sun::star; using namespace ::ooo::vba; -typedef boost::unordered_map< OUString, +typedef std::unordered_map< OUString, sal_Int32, OUStringHash, -::std::equal_to< OUString > > NameIndexHash; +std::equal_to< OUString > > NameIndexHash; static uno::Reference< XHelperInterface > lcl_createWorkbookHIParent( const uno::Reference< frame::XModel >& xModel, const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication ) { diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index ba030a688fab..8a9d26730946 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -53,7 +53,6 @@ #include "vbaworkbooks.hxx" #include <vbahelper/vbahelper.hxx> -#include <boost/unordered_map.hpp> #include <vector> #include <osl/file.hxx> using namespace ::ooo::vba; diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index 9d739b131ea3..7f1d88b2e4e8 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -68,9 +68,9 @@ #include "stringutil.hxx" #include <boost/scoped_ptr.hpp> -#include <boost/unordered_set.hpp> -#include <boost/unordered_map.hpp> #include <list> +#include <unordered_set> +#include <unordered_map> #include <vector> using namespace com::sun::star; @@ -1645,7 +1645,7 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16 typedef ScDPSaveDimension::MemberList MemList; const MemList& rDimMembers = pSaveDim->GetMembers(); list<OUString> aMembers; - boost::unordered_set<OUString, OUStringHash> aMemberSet; + std::unordered_set<OUString, OUStringHash> aMemberSet; size_t nMemberCount = 0; for (MemList::const_iterator itr = rDimMembers.begin(), itrEnd = rDimMembers.end(); itr != itrEnd; ++itr) @@ -1662,7 +1662,7 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16 // Collect and rank those custom sort strings that also exist in the member name list. - typedef boost::unordered_map<OUString, sal_uInt16, OUStringHash> UserSortMap; + typedef std::unordered_map<OUString, sal_uInt16, OUStringHash> UserSortMap; UserSortMap aSubStrs; sal_uInt16 nSubCount = 0; if (pUserListId) @@ -1766,7 +1766,7 @@ bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest ) bool bValid = ( aDestData.Dimension >= 0 ); // dropping onto a field // look through the source range - boost::unordered_set< OUString, OUStringHash, std::equal_to<OUString> > aMembersSet; // for lookup + std::unordered_set< OUString, OUStringHash, std::equal_to<OUString> > aMembersSet; // for lookup std::vector< OUString > aMembersVector; // members in original order, for inserting aMembersVector.reserve( std::max( static_cast<SCSIZE>( rSource.aEnd.Col() - rSource.aStart.Col() + 1 ), static_cast<SCSIZE>( rSource.aEnd.Row() - rSource.aStart.Row() + 1 ) ) ); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 10442a79f79b..df91fca6793e 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -661,9 +661,9 @@ public: class AddSelectedItemString : public std::unary_function<ScQueryEntry::Item, void> { - boost::unordered_set<OUString, OUStringHash>& mrSet; + std::unordered_set<OUString, OUStringHash>& mrSet; public: - AddSelectedItemString(boost::unordered_set<OUString, OUStringHash>& r) : + AddSelectedItemString(std::unordered_set<OUString, OUStringHash>& r) : mrSet(r) {} void operator() (const ScQueryEntry::Item& rItem) @@ -702,7 +702,7 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow) ScQueryParam aParam; pDBData->GetQueryParam(aParam); ScQueryEntry* pEntry = aParam.FindEntryByField(nCol, false); - boost::unordered_set<OUString, OUStringHash> aSelected; + std::unordered_set<OUString, OUStringHash> aSelected; if (pEntry && pEntry->bDoQuery) { if (pEntry->eOp == SC_EQUAL) diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 3728135d78b9..5b434428d3ba 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -46,15 +46,14 @@ #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp> +#include <unordered_map> #include <vector> #include <boost/scoped_ptr.hpp> -#include <boost/unordered_map.hpp> using namespace com::sun::star; using ::com::sun::star::sheet::DataPilotFieldOrientation; using ::std::vector; using ::std::unique_ptr; -using ::boost::unordered_map; // STATIC DATA ----------------------------------------------------------- @@ -528,7 +527,7 @@ void ScGridWindow::DPLaunchFieldPopupMenu( void ScGridWindow::UpdateDPFromFieldPopupMenu() { - typedef boost::unordered_map<OUString, OUString, OUStringHash> MemNameMapType; + typedef std::unordered_map<OUString, OUString, OUStringHash> MemNameMapType; if (!mpDPFieldPopup) return; |