diff options
Diffstat (limited to 'desktop/source/deployment/registry/dp_backend.cxx')
| -rwxr-xr-x | desktop/source/deployment/registry/dp_backend.cxx | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 266d4406cfde..a57ea2a6bbb4 100755 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.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. @@ -124,7 +125,7 @@ void PackageRegistryBackend::check() void PackageRegistryBackend::disposing() { try { - for ( t_string2ref::const_iterator i = m_bound.begin(); i != m_bound.end(); i++) + for ( t_string2ref::const_iterator i = m_bound.begin(); i != m_bound.end(); ++i) i->second->removeEventListener(this); m_bound.clear(); m_xComponentContext.clear(); @@ -277,7 +278,7 @@ void PackageRegistryBackend::deleteUnusedFolders( // get all temp directories: ::std::vector<OUString> tempEntries; - char tmp[] = ".tmp"; + const char tmp[] = ".tmp"; while (xResultSet->next()) { @@ -286,7 +287,7 @@ void PackageRegistryBackend::deleteUnusedFolders( xResultSet, UNO_QUERY_THROW )->getString( 1 /* Title */ ) ); - if (title.endsWithAsciiL(tmp, sizeof(tmp) - 1)) + if (title.endsWithAsciiL(RTL_CONSTASCII_STRINGPARAM(tmp))) tempEntries.push_back( makeURLAppendSysPathSegment(sDataFolder, title)); } @@ -638,7 +639,7 @@ beans::Optional< beans::Ambiguous<sal_Bool> > Package::isRegistered( catch (Exception &) { Any exc( ::cppu::getCaughtException() ); throw deployment::DeploymentException( - OUSTR("unexpected exception occured!"), + OUSTR("unexpected exception occurred!"), static_cast<OWeakObject *>(this), exc ); } } @@ -808,15 +809,23 @@ OUString Package::TypeInfo::getFileFilter() throw (RuntimeException) } //______________________________________________________________________________ -Any Package::TypeInfo::getIcon( sal_Bool highContrast, sal_Bool smallIcon ) +/************************** + * Get Icon + * + * @param highContrast NOTE: disabled the returning of high contrast icons. + * This bool is a noop now. + * @param smallIcon Return the small version of the icon + */ +Any Package::TypeInfo::getIcon( sal_Bool /*highContrast*/, sal_Bool smallIcon ) throw (RuntimeException) { if (! smallIcon) return Any(); - const sal_uInt16 nIconId = (highContrast ? m_smallIcon_HC : m_smallIcon); + const sal_uInt16 nIconId = m_smallIcon; return Any( &nIconId, getCppuType( static_cast<sal_uInt16 const *>(0) ) ); } } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |