diff options
| author | Noel Grandin <noel@peralex.com> | 2016-09-14 09:01:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-14 08:47:06 +0000 |
| commit | 20a9e101d909cb1953101e5962b74731e1265400 (patch) | |
| tree | 4e2516dcb7a5e19efb36fc4c2560b9211af83ce9 /svl | |
| parent | 0761f97525b3f3ce2cd73f8db28bf389a3c44f57 (diff) | |
loplugin:constantparam
clean up the plugin a little, and try to catch params which are default
constructed, which doesn't seem to be working yet
Change-Id: Ife45f18502a45cd26306424b7432c55fcbb0fd12
Reviewed-on: https://gerrit.libreoffice.org/28861
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/misc/inettype.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx index dddf64352b21..0f2749a9051a 100644 --- a/svl/source/misc/inettype.cxx +++ b/svl/source/misc/inettype.cxx @@ -44,7 +44,6 @@ struct TypeIDMapEntry { OUString m_aTypeName; OUString m_aPresentation; - OUString m_aSystemFileType; }; struct TypeNameMapEntry @@ -88,8 +87,7 @@ public: static INetContentType RegisterContentType(OUString const & rTypeName, OUString const & rPresentation, - OUString const * pExtension, - OUString const * pSystemFileType); + OUString const * pExtension); static INetContentType GetContentType(OUString const & rTypeName); @@ -421,8 +419,7 @@ TypeNameMapEntry * Registration::getExtensionEntry(OUString const & rTypeName) // static INetContentType Registration::RegisterContentType(OUString const & rTypeName, OUString const & rPresentation, - OUString const * pExtension, - OUString const * pSystemFileType) + OUString const * pExtension) { Registration &rRegistration = theRegistration::get(); @@ -435,8 +432,6 @@ INetContentType Registration::RegisterContentType(OUString const & rTypeName, TypeIDMapEntry * pTypeIDMapEntry = new TypeIDMapEntry; pTypeIDMapEntry->m_aTypeName = aTheTypeName; pTypeIDMapEntry->m_aPresentation = rPresentation; - if (pSystemFileType) - pTypeIDMapEntry->m_aSystemFileType = *pSystemFileType; rRegistration.m_aTypeIDMap.insert( ::std::make_pair( eTypeID, pTypeIDMapEntry ) ); rRegistration.m_aTypeNameMap.insert(std::make_pair(aTheTypeName, @@ -542,8 +537,7 @@ INetContentType INetContentTypes::RegisterContentType(OUString const & rTypeName INetContentType eTypeID = GetContentType(rTypeName); if (eTypeID == CONTENT_TYPE_UNKNOWN) eTypeID = Registration::RegisterContentType(rTypeName, rPresentation, - pExtension, - nullptr/*pSystemFileType*/); + pExtension); else if (eTypeID > CONTENT_TYPE_LAST) { TypeIDMapEntry * pTypeEntry = Registration::getEntry(eTypeID); |