diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-08 16:25:43 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-08 16:25:43 +0200 |
commit | 10bd50c25d485732cf274bec1e80a8500d91e071 (patch) | |
tree | 4dba008d46cc40e6f6a8756bc4d37dd5b35d7571 /i18npool | |
parent | 3c7a66a031331abdb6ed3134e2f1936a6eb5fbb0 (diff) |
loplugin:cstylecast: deal with remaining pointer casts
Change-Id: Ifdfb96f77ee23a2aaa7200ecee01f957050a6700
Diffstat (limited to 'i18npool')
15 files changed, 25 insertions, 25 deletions
diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx index 5cec8d475f80..f90b15dda5c9 100644 --- a/i18npool/inc/transliteration_Ignore.hxx +++ b/i18npool/inc/transliteration_Ignore.hxx @@ -100,7 +100,7 @@ TRANSLITERATION_IGNORE(Kashida_CTL) class ignore##name : public transliteration_Ignore {\ public:\ ignore##name () {\ - func = (TransFunc) 0;\ + func = nullptr;\ table = 0;\ map = 0;\ transliterationName = "ignore"#name;\ @@ -121,7 +121,7 @@ TRANSLITERATION_IGNORE(ProlongedSoundMark_ja_JP) class ignore##name : public transliteration_Ignore {\ public:\ ignore##name () {\ - func = (TransFunc) 0;\ + func = nullptr;\ table = 0;\ map = 0;\ transliterationName = "ignore"#name;\ diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx index 1674478a9c6a..e8474e9cecec 100644 --- a/i18npool/source/localedata/saxparser.cxx +++ b/i18npool/source/localedata/saxparser.cxx @@ -338,8 +338,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) // create and connect the document handler to the parser TestDocumentHandler *pDocHandler = new TestDocumentHandler( argv[1], argv[3]); - Reference < XDocumentHandler > rDocHandler( (XDocumentHandler *) pDocHandler ); - Reference< XEntityResolver > rEntityResolver( (XEntityResolver *) pDocHandler ); + Reference < XDocumentHandler > rDocHandler( static_cast<XDocumentHandler *>(pDocHandler) ); + Reference< XEntityResolver > rEntityResolver( static_cast<XEntityResolver *>(pDocHandler) ); rParser->setDocumentHandler( rDocHandler ); rParser->setEntityResolver( rEntityResolver ); diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx index d76f8e9289cf..598c92786c9f 100644 --- a/i18npool/source/registerservices/registerservices.cxx +++ b/i18npool/source/registerservices/registerservices.cxx @@ -69,8 +69,8 @@ using namespace ::com::sun::star; lang::XMultiServiceFactory >& ) \ { \ return uno::Reference < \ - uno::XInterface >( ( ::cppu::OWeakObject* ) \ - new ImplName ); \ + uno::XInterface >( static_cast<cppu::OWeakObject*>( \ + new ImplName) ); \ } #define IMPL_CREATEINSTANCE_CTX( ImplName ) \ @@ -80,8 +80,8 @@ using namespace ::com::sun::star; lang::XMultiServiceFactory >& rxMSF ) \ { \ return uno::Reference < \ - uno::XInterface >( ( ::cppu::OWeakObject* ) \ - new ImplName( comphelper::getComponentContext(rxMSF) ) ); \ + uno::XInterface >( static_cast<cppu::OWeakObject*>( \ + new ImplName( comphelper::getComponentContext(rxMSF) )) ); \ } typedef uno::Reference< diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index b62b56c06c33..fbc4db19994c 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -1104,8 +1104,8 @@ SAL_CALL TextSearch_CreateInstance( { return ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >( - (::cppu::OWeakObject*) new TextSearch( - comphelper::getComponentContext( rxMSF ) ) ); + static_cast<cppu::OWeakObject*>(new TextSearch( + comphelper::getComponentContext( rxMSF ) )) ); } extern "C" diff --git a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx index f9d308590765..1051576931da 100644 --- a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx +++ b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx @@ -28,7 +28,7 @@ namespace com { namespace sun { namespace star { namespace i18n { fullwidthToHalfwidth::fullwidthToHalfwidth() { - func = (TransFunc) 0; + func = nullptr; table = &widthfolding::getfull2halfTable(); transliterationName = "fullwidthToHalfwidth"; implementationName = "com.sun.star.i18n.Transliteration.FULLWIDTH_HALFWIDTH"; @@ -65,7 +65,7 @@ fullwidthToHalfwidth::transliterateChar2Char( sal_Unicode inChar) fullwidthKatakanaToHalfwidthKatakana::fullwidthKatakanaToHalfwidthKatakana() { - func = (TransFunc) 0; + func = nullptr; table = &widthfolding::getfullKana2halfKanaTable(); transliterationName = "fullwidthKatakanaToHalfwidthKatakana"; implementationName = "com.sun.star.i18n.Transliteration.FULLWIDTHKATAKANA_HALFWIDTHKATAKANA"; @@ -100,7 +100,7 @@ fullwidthKatakanaToHalfwidthKatakana::transliterateChar2Char( sal_Unicode inChar fullwidthToHalfwidthLikeASC::fullwidthToHalfwidthLikeASC() { - func = (TransFunc) 0; + func = nullptr; table = &widthfolding::getfull2halfTableForASC(); transliterationName = "fullwidthToHalfwidthLikeASC"; implementationName = "com.sun.star.i18n.Transliteration.FULLWIDTH_HALFWIDTH_LIKE_ASC"; diff --git a/i18npool/source/transliteration/halfwidthToFullwidth.cxx b/i18npool/source/transliteration/halfwidthToFullwidth.cxx index d350e357df12..4410525539b5 100644 --- a/i18npool/source/transliteration/halfwidthToFullwidth.cxx +++ b/i18npool/source/transliteration/halfwidthToFullwidth.cxx @@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star { namespace i18n { halfwidthToFullwidth::halfwidthToFullwidth() { - func = (TransFunc) 0; + func = nullptr; table = &widthfolding::gethalf2fullTable(); transliterationName = "halfwidthToFullwidth"; implementationName = "com.sun.star.i18n.Transliteration.HALFWIDTH_FULLWIDTH"; @@ -59,7 +59,7 @@ halfwidthToFullwidth::transliterateChar2Char( sal_Unicode inChar) halfwidthKatakanaToFullwidthKatakana::halfwidthKatakanaToFullwidthKatakana() { - func = (TransFunc) 0; + func = nullptr; table = &widthfolding::gethalfKana2fullKanaTable(); transliterationName = "halfwidthKatakanaToFullwidthKatakana"; implementationName = "com.sun.star.i18n.Transliteration.HALFWIDTHKATAKANA_FULLWIDTHKATAKANA"; @@ -89,7 +89,7 @@ halfwidthKatakanaToFullwidthKatakana::transliterateChar2Char( sal_Unicode inChar halfwidthToFullwidthLikeJIS::halfwidthToFullwidthLikeJIS() { - func = (TransFunc) 0; + func = nullptr; table = &widthfolding::gethalf2fullTableForJIS(); transliterationName = "halfwidthToFullwidthLikeJIS"; implementationName = "com.sun.star.i18n.Transliteration.HALFWIDTH_FULLWIDTH_LIKE_JIS"; diff --git a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx index 1285447d6d3a..962d3b387832 100644 --- a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx @@ -33,7 +33,7 @@ static const transliteration_Ignore::Mapping BaFa[] = { ignoreBaFa_ja_JP::ignoreBaFa_ja_JP() { - func = (TransFunc) 0; + func = nullptr; table = 0; map = BaFa; transliterationName = "ignoreBaFa_ja_JP"; diff --git a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx index 43e5bd04cc5d..50809db8e88c 100644 --- a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx @@ -34,7 +34,7 @@ static const transliteration_Ignore::Mapping HyuByu[] = { ignoreHyuByu_ja_JP::ignoreHyuByu_ja_JP() { - func = (TransFunc) 0; + func = nullptr; table = 0; map = HyuByu; transliterationName = "ignoreHyuByu_ja_JP"; diff --git a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx index fcc32a26addb..9951d8eac562 100644 --- a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx @@ -39,7 +39,7 @@ static const transliteration_Ignore::Mapping SeZe[] = { ignoreSeZe_ja_JP::ignoreSeZe_ja_JP() { - func = (TransFunc) 0; + func = nullptr; table = 0; map = SeZe; transliterationName = "ignoreSeZe_ja_JP"; diff --git a/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx b/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx index 2665c5a4a025..8b886ee4d000 100644 --- a/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx @@ -100,7 +100,7 @@ OneToOneMappingTable_t ignoreSeparatorTable[] = { ignoreSeparator_ja_JP::ignoreSeparator_ja_JP() { static oneToOneMapping _table(ignoreSeparatorTable, sizeof(ignoreSeparatorTable)); - func = (TransFunc) 0; + func = nullptr; table = &_table; map = 0; transliterationName = "ignoreSeparator_ja_JP"; diff --git a/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx b/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx index 4a38eb73a7bd..ef5e3207129b 100644 --- a/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx @@ -42,7 +42,7 @@ OneToOneMappingTable_t ignoreSpace_ja_JP_mappingTable[] = { ignoreSpace_ja_JP::ignoreSpace_ja_JP() { - func = (TransFunc)0; + func = nullptr; table = new oneToOneMapping(ignoreSpace_ja_JP_mappingTable, sizeof(ignoreSpace_ja_JP_mappingTable)); map = 0; transliterationName = "ignoreSpace_ja_JP"; diff --git a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx index 6bdf54aaab22..686e952c4b8a 100644 --- a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx @@ -43,7 +43,7 @@ static const transliteration_Ignore::Mapping TiJi[] = { ignoreTiJi_ja_JP::ignoreTiJi_ja_JP() { - func = (TransFunc) 0; + func = nullptr; table = 0; map = TiJi; transliterationName = "ignoreTiJi_ja_JP"; diff --git a/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx b/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx index aca992d9cb52..765cc33e22ea 100644 --- a/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx @@ -722,7 +722,7 @@ OneToOneMappingTable_t traditionalKanji2updateKanji[] = { ignoreTraditionalKanji_ja_JP::ignoreTraditionalKanji_ja_JP() { static oneToOneMapping _table(traditionalKanji2updateKanji, sizeof(traditionalKanji2updateKanji)); - func = (TransFunc)0; + func = nullptr; table = &_table; map = 0; transliterationName = "ignoreTraditionalKanji_ja_JP"; diff --git a/i18npool/source/transliteration/largeToSmall_ja_JP.cxx b/i18npool/source/transliteration/largeToSmall_ja_JP.cxx index 3b42ec62a48e..f4f62ae62312 100644 --- a/i18npool/source/transliteration/largeToSmall_ja_JP.cxx +++ b/i18npool/source/transliteration/largeToSmall_ja_JP.cxx @@ -69,7 +69,7 @@ OneToOneMappingTable_t large2small[] = { largeToSmall_ja_JP::largeToSmall_ja_JP() { static oneToOneMapping _table(large2small, sizeof(large2small)); - func = (TransFunc) 0; + func = nullptr; table = &_table; transliterationName = "largeToSmall_ja_JP"; implementationName = "com.sun.star.i18n.Transliteration.largeToSmall_ja_JP"; diff --git a/i18npool/source/transliteration/smallToLarge_ja_JP.cxx b/i18npool/source/transliteration/smallToLarge_ja_JP.cxx index 1ec47c0617f5..49827dd041f0 100644 --- a/i18npool/source/transliteration/smallToLarge_ja_JP.cxx +++ b/i18npool/source/transliteration/smallToLarge_ja_JP.cxx @@ -69,7 +69,7 @@ OneToOneMappingTable_t small2large[] = { smallToLarge_ja_JP::smallToLarge_ja_JP() { static oneToOneMapping _table(small2large, sizeof(small2large)); - func = (TransFunc) 0; + func = nullptr; table = &_table; transliterationName = "smallToLarge_ja_JP"; implementationName = "com.sun.star.i18n.Transliteration.smallToLarge_ja_JP"; |