From b36963c0a6a09f70ca6d8d607dd3249a3496497d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 16:04:04 +0200 Subject: Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274 --- i18npool/inc/transliteration_commonclass.hxx | 38 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'i18npool/inc/transliteration_commonclass.hxx') diff --git a/i18npool/inc/transliteration_commonclass.hxx b/i18npool/inc/transliteration_commonclass.hxx index 32e511af2924..de4071882218 100644 --- a/i18npool/inc/transliteration_commonclass.hxx +++ b/i18npool/inc/transliteration_commonclass.hxx @@ -39,72 +39,72 @@ public: // Methods which are shared. void SAL_CALL loadModule( TransliterationModules modName, const com::sun::star::lang::Locale& rLocale ) - throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(com::sun::star::uno::RuntimeException, std::exception) override; void SAL_CALL loadModuleNew( const com::sun::star::uno::Sequence< TransliterationModulesNew >& modName, const com::sun::star::lang::Locale& rLocale ) - throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(com::sun::star::uno::RuntimeException, std::exception) override; void SAL_CALL loadModuleByImplName( const OUString& implName, const com::sun::star::lang::Locale& rLocale ) - throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(com::sun::star::uno::RuntimeException, std::exception) override; void SAL_CALL loadModulesByImplNames(const com::sun::star::uno::Sequence< OUString >& modNamelist, const com::sun::star::lang::Locale& rLocale) - throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(com::sun::star::uno::RuntimeException, std::exception) override; com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableModules( const com::sun::star::lang::Locale& rLocale, sal_Int16 sType ) - throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(com::sun::star::uno::RuntimeException, std::exception) override; // Methods which should be implemented in each transliteration module. - virtual OUString SAL_CALL getName() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getType( ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual sal_Int16 SAL_CALL getType( ) throw(com::sun::star::uno::RuntimeException, std::exception) override = 0; virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) - throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + throw(com::sun::star::uno::RuntimeException, std::exception) override = 0; virtual OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset) - throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + throw(com::sun::star::uno::RuntimeException, std::exception) override = 0; // Methods in XExtendedTransliteration virtual OUString SAL_CALL transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) - throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL transliterateChar2String( sal_Unicode inChar) - throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar ) throw(com::sun::star::i18n::MultipleCharsOutputException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + com::sun::star::uno::RuntimeException, std::exception) override = 0; virtual sal_Bool SAL_CALL equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) - throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + throw(com::sun::star::uno::RuntimeException, std::exception) override = 0; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, const OUString& str2 ) - throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + throw(com::sun::star::uno::RuntimeException, std::exception) override = 0; virtual sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1, const OUString& s2, sal_Int32 off2, sal_Int32 len2) - throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) - throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(com::sun::star::uno::RuntimeException, std::exception) override; //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; protected: com::sun::star::lang::Locale aLocale; const sal_Char* transliterationName; -- cgit