diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-05 23:42:23 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-06 08:04:23 +0100 |
| commit | 07ab0d43b58cf7ee16c36016d6b9b70c0ebbb9b1 (patch) | |
| tree | ac80d5449c42f832c14eb3fb3030208ae752b282 /unotools | |
| parent | 4a8175ebeb58555e5d48df134cfaf128293888f1 (diff) | |
Get rid of DECLARE_STL_VECTOR
Change-Id: If4588034fc09e4663b5217669c71f26c0a3b8c8a
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/configvaluecontainer.cxx | 6 | ||||
| -rw-r--r-- | unotools/source/misc/eventlisteneradapter.cxx | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx index 4ec5810f24eb..53bc30b035d5 100644 --- a/unotools/source/config/configvaluecontainer.cxx +++ b/unotools/source/config/configvaluecontainer.cxx @@ -20,9 +20,9 @@ #include <unotools/configvaluecontainer.hxx> #include <unotools/confignode.hxx> #include <tools/debug.hxx> -#include <comphelper/stl_types.hxx> #include <uno/data.h> #include <algorithm> +#include <vector> #ifdef DBG_UTIL #include <rtl/strbuf.hxx> @@ -205,7 +205,7 @@ namespace utl } }; - DECLARE_STL_VECTOR( NodeValueAccessor, NodeValueAccessors ); + typedef std::vector<NodeValueAccessor> NodeValueAccessors; //===================================================================== //= OConfigurationValueContainerImpl @@ -329,7 +329,7 @@ namespace utl #ifdef DBG_UTIL // another check (should be the first container for this node) - ConstNodeValueAccessorsIterator aExistent = ::std::find( + NodeValueAccessors::const_iterator aExistent = ::std::find( m_pImpl->aAccessors.begin(), m_pImpl->aAccessors.end(), _rAccessor diff --git a/unotools/source/misc/eventlisteneradapter.cxx b/unotools/source/misc/eventlisteneradapter.cxx index ffd38778d7c8..61b4257d4576 100644 --- a/unotools/source/misc/eventlisteneradapter.cxx +++ b/unotools/source/misc/eventlisteneradapter.cxx @@ -17,10 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <vector> + #include <unotools/eventlisteneradapter.hxx> #include <osl/diagnose.h> #include <cppuhelper/implbase1.hxx> -#include <comphelper/stl_types.hxx> //......................................................................... namespace utl |