From 8c2327ca349da9edad0f6e494be3f1c11378d15c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 18 Sep 2017 16:51:55 +0200 Subject: unused Registration class since commit 1b694dad643334ec1bab3f823dcd68f44a05ebe3 Date: Thu Aug 24 22:14:27 2017 +0200 loplugin:unusedmethods Change-Id: I54ec057e9216f3b245b86b6c81fb75ca06917d74 --- svl/source/misc/inettype.cxx | 71 ++------------------------------------------ 1 file changed, 3 insertions(+), 68 deletions(-) (limited to 'svl') diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx index a019f975b23c..3480a55741a3 100644 --- a/svl/source/misc/inettype.cxx +++ b/svl/source/misc/inettype.cxx @@ -39,36 +39,6 @@ struct MediaTypeEntry INetContentType m_eTypeID; }; -struct TypeIDMapEntry -{ - OUString m_aTypeName; -}; - -class Registration -{ - typedef std::map TypeIDMap; - - TypeIDMap m_aTypeIDMap; // map ContentType to TypeID - -public: - Registration() {} - - ~Registration(); -public: - - static INetContentType GetContentType(OUString const & rTypeName); - - static OUString GetContentType(INetContentType eTypeID); - - static INetContentType GetContentType4Extension(OUString const & rExtension); - -}; - -namespace -{ - struct theRegistration - : public rtl::Static< Registration, theRegistration > {}; -} MediaTypeEntry const * seekEntry(OUString const & rTypeName, MediaTypeEntry const * pMap, std::size_t nSize); @@ -252,39 +222,6 @@ MediaTypeEntry const aStaticExtensionMap[] } -// Registration - - -Registration::~Registration() -{ - for ( TypeIDMap::iterator it = m_aTypeIDMap.begin(); it != m_aTypeIDMap.end(); ++it ) - delete it->second; -} - -// static -INetContentType Registration::GetContentType(OUString const &) -{ - return CONTENT_TYPE_UNKNOWN; -} - -// static -OUString Registration::GetContentType(INetContentType eTypeID) -{ - Registration &rRegistration = theRegistration::get(); - - TypeIDMap::const_iterator pEntry = rRegistration.m_aTypeIDMap.find( eTypeID ); - if( pEntry != rRegistration.m_aTypeIDMap.end() ) - return pEntry->second->m_aTypeName; - return OUString(); -} - -// static -INetContentType Registration::GetContentType4Extension(OUString const & ) -{ - return CONTENT_TYPE_UNKNOWN; -} - - // seekEntry @@ -333,7 +270,7 @@ INetContentType INetContentTypes::GetContentType(OUString const & rTypeName) aType += aSubType; MediaTypeEntry const * pEntry = seekEntry(aType, aStaticTypeNameMap, CONTENT_TYPE_LAST + 1); - return pEntry ? pEntry->m_eTypeID : Registration::GetContentType(aType); + return pEntry ? pEntry->m_eTypeID : CONTENT_TYPE_UNKNOWN; } else return rTypeName.equalsIgnoreAsciiCase(CONTENT_TYPE_STR_X_STARMAIL) ? @@ -357,7 +294,7 @@ OUString INetContentTypes::GetContentType(INetContentType eTypeID) } OUString aTypeName = eTypeID <= CONTENT_TYPE_LAST ? OUString::createFromAscii(aMap[eTypeID]) - : Registration::GetContentType(eTypeID); + : OUString(); if (aTypeName.isEmpty()) { OSL_FAIL("INetContentTypes::GetContentType(): Bad ID"); @@ -373,9 +310,7 @@ INetContentType INetContentTypes::GetContentType4Extension(OUString const & rExt SAL_N_ELEMENTS(aStaticExtensionMap)); if (pEntry) return pEntry->m_eTypeID; - INetContentType eTypeID = Registration::GetContentType4Extension(rExtension); - return eTypeID == CONTENT_TYPE_UNKNOWN ? CONTENT_TYPE_APP_OCTSTREAM - : eTypeID; + return CONTENT_TYPE_APP_OCTSTREAM; } //static -- cgit