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 /comphelper | |
| parent | 0b5e5783d8b15b0415c9fd5043932882904aece8 (diff) | |
Get rid of DECLARE_STL_USTRINGACCESS_MAP
Change-Id: I00d02eaeff3eaa5f49550eb9c1d4e4e7e0b2203c
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/container/NamedPropertyValuesContainer.cxx | 4 | ||||
| -rw-r--r-- | comphelper/source/container/namecontainer.cxx | 6 | ||||
| -rw-r--r-- | comphelper/source/property/genericpropertyset.cxx | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx index 61ff126ee849..66817f298c2b 100644 --- a/comphelper/source/container/NamedPropertyValuesContainer.cxx +++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx @@ -25,15 +25,13 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <cppuhelper/implbase2.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <comphelper/stl_types.hxx> - #include <map> using namespace com::sun::star; -DECLARE_STL_USTRINGACCESS_MAP( uno::Sequence<beans::PropertyValue>, NamedPropertyValues ); +typedef std::map< OUString, uno::Sequence<beans::PropertyValue> > NamedPropertyValues; class NamedPropertyValuesContainer : public cppu::WeakImplHelper2< container::XNameContainer, lang::XServiceInfo > { diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx index f1ee4150e391..7d1905555aa4 100644 --- a/comphelper/source/container/namecontainer.cxx +++ b/comphelper/source/container/namecontainer.cxx @@ -17,13 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <map> + #include <comphelper/namecontainer.hxx> #include <cppuhelper/implbase1.hxx> #include <osl/diagnose.h> #include <osl/mutex.hxx> #include <comphelper/stl_types.hxx> -DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Any, SvGenericNameContainerMapImpl ); +typedef std::map<OUString, ::com::sun::star::uno::Any> SvGenericNameContainerMapImpl; namespace comphelper { diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index fd052bbf9105..1261db323f7e 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <map> + #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <cppuhelper/weakagg.hxx> @@ -41,7 +45,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; -DECLARE_STL_USTRINGACCESS_MAP( Any, GenericAnyMapImpl ); +typedef std::map<OUString, Any> GenericAnyMapImpl; namespace comphelper { |