diff options
Diffstat (limited to 'dbaccess/source/core/api/View.cxx')
-rw-r--r-- | dbaccess/source/core/api/View.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx index c52c4885c757..efbbd8b412df 100644 --- a/dbaccess/source/core/api/View.cxx +++ b/dbaccess/source/core/api/View.cxx @@ -24,7 +24,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> namespace dbaccess { @@ -52,7 +52,7 @@ namespace dbaccess try { Reference<XMultiServiceFactory> xFac(_rxConnection,UNO_QUERY_THROW); - m_xViewAccess.set(xFac->createInstance(lcl_getServiceNameForSetting(_rxConnection,"ViewAccessServiceName")),UNO_QUERY); + m_xViewAccess.set(xFac->createInstance(lcl_getServiceNameForSetting(_rxConnection,u"ViewAccessServiceName"_ustr)),UNO_QUERY); } catch(const Exception& ) { @@ -85,13 +85,9 @@ namespace dbaccess std::vector<Type> aOwnTypes; aOwnTypes.reserve(aTypes.getLength()); - const Type* pIter = aTypes.getConstArray(); - const Type* pEnd = pIter + aTypes.getLength(); - for(;pIter != pEnd ;++pIter) - { - if( *pIter != aAlterType || m_xViewAccess.is() ) - aOwnTypes.push_back(*pIter); - } + for (auto& type : aTypes) + if (m_xViewAccess || type != aAlterType) + aOwnTypes.push_back(type); return Sequence< Type >(aOwnTypes.data(), aOwnTypes.size()); } |