diff options
Diffstat (limited to 'ucb/source/ucp/package/pkgprovider.cxx')
-rwxr-xr-x[-rw-r--r--] | ucb/source/ucp/package/pkgprovider.cxx | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index 92c35fe78bb9..27d411233225 100644..100755 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,7 +35,7 @@ *************************************************************************/ -#include <hash_map> +#include <boost/unordered_map.hpp> #include <osl/diagnose.h> #include <cppuhelper/weak.hxx> #include <ucbhelper/contentidentifier.hxx> @@ -116,7 +117,7 @@ struct hashString } }; -typedef std::hash_map +typedef boost::unordered_map < rtl::OUString, Package*, @@ -182,10 +183,10 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, //========================================================================= XSERVICEINFO_IMPL_1( ContentProvider, - rtl::OUString::createFromAscii( - "com.sun.star.comp.ucb.PackageContentProvider" ), - rtl::OUString::createFromAscii( - PACKAGE_CONTENT_PROVIDER_SERVICE_NAME ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.ucb.PackageContentProvider" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + PACKAGE_CONTENT_PROVIDER_SERVICE_NAME )) ); //========================================================================= // @@ -277,8 +278,8 @@ ContentProvider::createPackage( const rtl::OUString & rName, const rtl::OUString uno::Reference< uno::XInterface > xIfc = m_xSMgr->createInstanceWithArguments( - rtl::OUString::createFromAscii( - "com.sun.star.packages.comp.ZipPackage" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.packages.comp.ZipPackage" )), aArguments ); if ( xIfc.is() ) @@ -328,3 +329,4 @@ sal_Bool ContentProvider::removePackage( const rtl::OUString & rName ) return sal_False; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |