(i) if the trade mark consists solely of that word or those words, all rights of the proprietor, whether under the common law or by registration, to the exclusive use of the trade mark in relation to the article or substance in question or to any goods of the same description; or (ii) if the trade mark contains that word or those words and other matter, all such rights of the proprietor to the exc