diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-05 22:41:15 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-06 08:04:22 +0100 |
| commit | 4a8175ebeb58555e5d48df134cfaf128293888f1 (patch) | |
| tree | 316963d1842bcf5ea16f489dc1c6d076fe9bb3c9 /extensions/source/abpilot | |
| parent | 0b5e5783d8b15b0415c9fd5043932882904aece8 (diff) | |
Get rid of DECLARE_STL_USTRINGACCESS_MAP
Change-Id: I00d02eaeff3eaa5f49550eb9c1d4e4e7e0b2203c
Diffstat (limited to 'extensions/source/abpilot')
| -rw-r--r-- | extensions/source/abpilot/abptypes.hxx | 4 | ||||
| -rw-r--r-- | extensions/source/abpilot/fieldmappingimpl.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/extensions/source/abpilot/abptypes.hxx b/extensions/source/abpilot/abptypes.hxx index 435ef5ad77a6..1cb4abf6fd78 100644 --- a/extensions/source/abpilot/abptypes.hxx +++ b/extensions/source/abpilot/abptypes.hxx @@ -22,9 +22,9 @@ #include <sal/config.h> +#include <map> #include <set> -#include <comphelper/stl_types.hxx> #include <rtl/ustring.hxx> //......................................................................... @@ -34,7 +34,7 @@ namespace abp typedef std::set<OUString> StringBag; - DECLARE_STL_USTRINGACCESS_MAP( OUString, MapString2String ); + typedef std::map<OUString, OUString> MapString2String; //......................................................................... } // namespace abp diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index f220fd0b078c..497a7d293d63 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -251,7 +251,7 @@ namespace abp // there should be a redundancy in the config data .... if this asserts, there isn't anymore! // do we have a new alias for the programmatic? - MapString2StringIterator aPos = aFieldAssignment.find( *pExistentFields ); + MapString2String::iterator aPos = aFieldAssignment.find( *pExistentFields ); if ( aFieldAssignment.end() != aPos ) { // yes // -> set a new value @@ -269,7 +269,7 @@ namespace abp // now everything remaining in aFieldAssignment marks a mapping entry which was not present // in the config before - for ( ConstMapString2StringIterator aNewMapping = aFieldAssignment.begin(); + for ( MapString2String::const_iterator aNewMapping = aFieldAssignment.begin(); aNewMapping != aFieldAssignment.end(); ++aNewMapping ) |