Kaydet (Commit) 57fbefe7 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

remove boost/unordered_map.hpp include from types.hxx.

types.hxx is included by pretty much everyone inside sc.  Let's not
stick a boost header in there...

Change-Id: Iaf2aa9e13d0e02437bcd9e71a0143432abfa0a7c
üst 42c8178c
...@@ -265,6 +265,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ ...@@ -265,6 +265,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/tool/refreshtimer \ sc/source/core/tool/refreshtimer \
sc/source/core/tool/reftokenhelper \ sc/source/core/tool/reftokenhelper \
sc/source/core/tool/refupdat \ sc/source/core/tool/refupdat \
sc/source/core/tool/reordermap \
sc/source/core/tool/scmatrix \ sc/source/core/tool/scmatrix \
sc/source/core/tool/scopetools \ sc/source/core/tool/scopetools \
sc/source/core/tool/sharedformula \ sc/source/core/tool/sharedformula \
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <vector> #include <vector>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_vector.hpp>
#include <boost/unordered_set.hpp> #include <boost/unordered_map.hpp>
class ScDocument; class ScDocument;
class ScTokenArray; class ScTokenArray;
......
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
#include <address.hxx> #include <address.hxx>
#include <svl/listener.hxx> #include <svl/listener.hxx>
#include <boost/unordered_map.hpp>
namespace sc { namespace sc {
/** /**
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
namespace sc { namespace sc {
struct RefUpdateContext; struct RefUpdateContext;
class ColRowReorderMapType;
class RefHint : public SfxSimpleHint class RefHint : public SfxSimpleHint
{ {
......
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_SC_REORDERMAP_HXX
#define INCLUDED_SC_REORDERMAP_HXX
#include <types.hxx>
#include <boost/unordered_map.hpp>
namespace sc {
class ColRowReorderMapType
{
typedef boost::unordered_map<SCCOLROW,SCCOLROW> DataType;
DataType maData;
public:
typedef DataType::value_type value_type;
typedef DataType::const_iterator const_iterator;
typedef DataType::iterator iterator;
const_iterator end() const;
std::pair<iterator, bool>
insert( DataType::value_type const& val );
const_iterator find( DataType::key_type const& key ) const;
};
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -36,6 +36,7 @@ struct RefUpdateDeleteTabContext; ...@@ -36,6 +36,7 @@ struct RefUpdateDeleteTabContext;
struct RefUpdateMoveTabContext; struct RefUpdateMoveTabContext;
struct RefUpdateResult; struct RefUpdateResult;
struct TokenStringContext; struct TokenStringContext;
class ColRowReorderMapType;
} }
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include <sal/types.h> #include <sal/types.h>
#include <boost/intrusive_ptr.hpp> #include <boost/intrusive_ptr.hpp>
#include <boost/unordered_map.hpp>
class ScMatrix; class ScMatrix;
...@@ -98,8 +97,6 @@ struct RangeMatrix ...@@ -98,8 +97,6 @@ struct RangeMatrix
bool isRangeValid() const; bool isRangeValid() const;
}; };
typedef boost::unordered_map<SCCOLROW,SCCOLROW> ColRowReorderMapType;
enum AreaOverlapType enum AreaOverlapType
{ {
AreaInside, AreaInside,
......
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
#include <refhint.hxx> #include <refhint.hxx>
#include <listenerquery.hxx> #include <listenerquery.hxx>
#include <bcaslot.hxx> #include <bcaslot.hxx>
#include <reordermap.hxx>
#include <svl/sharedstringpool.hxx> #include <svl/sharedstringpool.hxx>
......
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <reordermap.hxx>
namespace sc {
ColRowReorderMapType::const_iterator ColRowReorderMapType::end() const
{
return maData.end();
}
std::pair<ColRowReorderMapType::iterator, bool>
ColRowReorderMapType::insert( ColRowReorderMapType::value_type const& val )
{
return maData.insert(val);
}
ColRowReorderMapType::const_iterator
ColRowReorderMapType::find( DataType::key_type const& key ) const
{
return maData.find(key);
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include "types.hxx" #include "types.hxx"
#include "globstr.hrc" #include "globstr.hrc"
#include "addincol.hxx" #include "addincol.hxx"
#include <reordermap.hxx>
#include <svl/sharedstring.hxx> #include <svl/sharedstring.hxx>
using ::std::vector; using ::std::vector;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment