diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-05 17:42:08 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-05 18:36:21 +0100 |
| commit | 0c55303581156d01992d9d958ac5f7aafc4a3ebb (patch) | |
| tree | dd0243205b6a81139ee34e93b31b8c60ec384514 /extensions | |
| parent | 75c4bff5f402229267d53ca6f5ece28473bff7d8 (diff) | |
Get rid of DECLARE_STL_STDKEY_SET
Change-Id: I4817694d183d525fa5a29eb9693a20d491549e5d
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/abpilot/abptypes.hxx | 6 | ||||
| -rw-r--r-- | extensions/source/abpilot/datasourcehandling.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/abpilot/tableselectionpage.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/dbpilots/dbptypes.hxx | 6 |
4 files changed, 12 insertions, 4 deletions
diff --git a/extensions/source/abpilot/abptypes.hxx b/extensions/source/abpilot/abptypes.hxx index 0af46d175dff..435ef5ad77a6 100644 --- a/extensions/source/abpilot/abptypes.hxx +++ b/extensions/source/abpilot/abptypes.hxx @@ -20,6 +20,10 @@ #ifndef EXTENSIONS_ABP_ABPTYPES_HXX #define EXTENSIONS_ABP_ABPTYPES_HXX +#include <sal/config.h> + +#include <set> + #include <comphelper/stl_types.hxx> #include <rtl/ustring.hxx> @@ -28,7 +32,7 @@ namespace abp { //......................................................................... - DECLARE_STL_STDKEY_SET( OUString, StringBag ); + typedef std::set<OUString> StringBag; DECLARE_STL_USTRINGACCESS_MAP( OUString, MapString2String ); diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index f9b0415b7d79..65d97ffc2240 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -213,7 +213,7 @@ namespace abp OUString& ODataSourceContext::disambiguate(OUString& _rDataSourceName) { OUString sCheck( _rDataSourceName ); - ConstStringBagIterator aPos = m_pImpl->aDataSourceNames.find( sCheck ); + StringBag::const_iterator aPos = m_pImpl->aDataSourceNames.find( sCheck ); sal_Int32 nPostFix = 1; while ( ( m_pImpl->aDataSourceNames.end() != aPos ) && ( nPostFix < 65535 ) ) diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx index c2f1a940da90..724cbd5571f8 100644 --- a/extensions/source/abpilot/tableselectionpage.cxx +++ b/extensions/source/abpilot/tableselectionpage.cxx @@ -72,7 +72,7 @@ namespace abp // this page should never bother the user if there is 1 or less tables. // fill the list - for ( ConstStringBagIterator aTables = aTableNames.begin(); + for ( StringBag::const_iterator aTables = aTableNames.begin(); aTables != aTableNames.end(); ++aTables ) diff --git a/extensions/source/dbpilots/dbptypes.hxx b/extensions/source/dbpilots/dbptypes.hxx index 3b99d4c7aabf..1b409b3a98a6 100644 --- a/extensions/source/dbpilots/dbptypes.hxx +++ b/extensions/source/dbpilots/dbptypes.hxx @@ -20,6 +20,10 @@ #ifndef _EXTENSIONS_DBP_DBPTYPES_HXX_ #define _EXTENSIONS_DBP_DBPTYPES_HXX_ +#include <sal/config.h> + +#include <set> + #include <comphelper/stl_types.hxx> //......................................................................... @@ -28,7 +32,7 @@ namespace dbp //......................................................................... DECLARE_STL_VECTOR( OUString, StringArray ); - DECLARE_STL_STDKEY_SET( OUString, StringBag ); + typedef std::set<OUString> StringBag; DECLARE_STL_STDKEY_MAP( sal_uInt32, OUString, MapInt2String ); //......................................................................... |