Kaydet (Commit) 10bd50c2 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:cstylecast: deal with remaining pointer casts

Change-Id: Ifdfb96f77ee23a2aaa7200ecee01f957050a6700
üst 3c7a66a0
...@@ -100,7 +100,7 @@ TRANSLITERATION_IGNORE(Kashida_CTL) ...@@ -100,7 +100,7 @@ TRANSLITERATION_IGNORE(Kashida_CTL)
class ignore##name : public transliteration_Ignore {\ class ignore##name : public transliteration_Ignore {\
public:\ public:\
ignore##name () {\ ignore##name () {\
func = (TransFunc) 0;\ func = nullptr;\
table = 0;\ table = 0;\
map = 0;\ map = 0;\
transliterationName = "ignore"#name;\ transliterationName = "ignore"#name;\
...@@ -121,7 +121,7 @@ TRANSLITERATION_IGNORE(ProlongedSoundMark_ja_JP) ...@@ -121,7 +121,7 @@ TRANSLITERATION_IGNORE(ProlongedSoundMark_ja_JP)
class ignore##name : public transliteration_Ignore {\ class ignore##name : public transliteration_Ignore {\
public:\ public:\
ignore##name () {\ ignore##name () {\
func = (TransFunc) 0;\ func = nullptr;\
table = 0;\ table = 0;\
map = 0;\ map = 0;\
transliterationName = "ignore"#name;\ transliterationName = "ignore"#name;\
......
...@@ -338,8 +338,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) ...@@ -338,8 +338,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
// create and connect the document handler to the parser // create and connect the document handler to the parser
TestDocumentHandler *pDocHandler = new TestDocumentHandler( argv[1], argv[3]); TestDocumentHandler *pDocHandler = new TestDocumentHandler( argv[1], argv[3]);
Reference < XDocumentHandler > rDocHandler( (XDocumentHandler *) pDocHandler ); Reference < XDocumentHandler > rDocHandler( static_cast<XDocumentHandler *>(pDocHandler) );
Reference< XEntityResolver > rEntityResolver( (XEntityResolver *) pDocHandler ); Reference< XEntityResolver > rEntityResolver( static_cast<XEntityResolver *>(pDocHandler) );
rParser->setDocumentHandler( rDocHandler ); rParser->setDocumentHandler( rDocHandler );
rParser->setEntityResolver( rEntityResolver ); rParser->setEntityResolver( rEntityResolver );
......
...@@ -69,8 +69,8 @@ using namespace ::com::sun::star; ...@@ -69,8 +69,8 @@ using namespace ::com::sun::star;
lang::XMultiServiceFactory >& ) \ lang::XMultiServiceFactory >& ) \
{ \ { \
return uno::Reference < \ return uno::Reference < \
uno::XInterface >( ( ::cppu::OWeakObject* ) \ uno::XInterface >( static_cast<cppu::OWeakObject*>( \
new ImplName ); \ new ImplName) ); \
} }
#define IMPL_CREATEINSTANCE_CTX( ImplName ) \ #define IMPL_CREATEINSTANCE_CTX( ImplName ) \
...@@ -80,8 +80,8 @@ using namespace ::com::sun::star; ...@@ -80,8 +80,8 @@ using namespace ::com::sun::star;
lang::XMultiServiceFactory >& rxMSF ) \ lang::XMultiServiceFactory >& rxMSF ) \
{ \ { \
return uno::Reference < \ return uno::Reference < \
uno::XInterface >( ( ::cppu::OWeakObject* ) \ uno::XInterface >( static_cast<cppu::OWeakObject*>( \
new ImplName( comphelper::getComponentContext(rxMSF) ) ); \ new ImplName( comphelper::getComponentContext(rxMSF) )) ); \
} }
typedef uno::Reference< typedef uno::Reference<
......
...@@ -1104,8 +1104,8 @@ SAL_CALL TextSearch_CreateInstance( ...@@ -1104,8 +1104,8 @@ SAL_CALL TextSearch_CreateInstance(
{ {
return ::com::sun::star::uno::Reference< return ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >( ::com::sun::star::uno::XInterface >(
(::cppu::OWeakObject*) new TextSearch( static_cast<cppu::OWeakObject*>(new TextSearch(
comphelper::getComponentContext( rxMSF ) ) ); comphelper::getComponentContext( rxMSF ) )) );
} }
extern "C" extern "C"
......
...@@ -28,7 +28,7 @@ namespace com { namespace sun { namespace star { namespace i18n { ...@@ -28,7 +28,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
fullwidthToHalfwidth::fullwidthToHalfwidth() fullwidthToHalfwidth::fullwidthToHalfwidth()
{ {
func = (TransFunc) 0; func = nullptr;
table = &widthfolding::getfull2halfTable(); table = &widthfolding::getfull2halfTable();
transliterationName = "fullwidthToHalfwidth"; transliterationName = "fullwidthToHalfwidth";
implementationName = "com.sun.star.i18n.Transliteration.FULLWIDTH_HALFWIDTH"; implementationName = "com.sun.star.i18n.Transliteration.FULLWIDTH_HALFWIDTH";
...@@ -65,7 +65,7 @@ fullwidthToHalfwidth::transliterateChar2Char( sal_Unicode inChar) ...@@ -65,7 +65,7 @@ fullwidthToHalfwidth::transliterateChar2Char( sal_Unicode inChar)
fullwidthKatakanaToHalfwidthKatakana::fullwidthKatakanaToHalfwidthKatakana() fullwidthKatakanaToHalfwidthKatakana::fullwidthKatakanaToHalfwidthKatakana()
{ {
func = (TransFunc) 0; func = nullptr;
table = &widthfolding::getfullKana2halfKanaTable(); table = &widthfolding::getfullKana2halfKanaTable();
transliterationName = "fullwidthKatakanaToHalfwidthKatakana"; transliterationName = "fullwidthKatakanaToHalfwidthKatakana";
implementationName = "com.sun.star.i18n.Transliteration.FULLWIDTHKATAKANA_HALFWIDTHKATAKANA"; implementationName = "com.sun.star.i18n.Transliteration.FULLWIDTHKATAKANA_HALFWIDTHKATAKANA";
...@@ -100,7 +100,7 @@ fullwidthKatakanaToHalfwidthKatakana::transliterateChar2Char( sal_Unicode inChar ...@@ -100,7 +100,7 @@ fullwidthKatakanaToHalfwidthKatakana::transliterateChar2Char( sal_Unicode inChar
fullwidthToHalfwidthLikeASC::fullwidthToHalfwidthLikeASC() fullwidthToHalfwidthLikeASC::fullwidthToHalfwidthLikeASC()
{ {
func = (TransFunc) 0; func = nullptr;
table = &widthfolding::getfull2halfTableForASC(); table = &widthfolding::getfull2halfTableForASC();
transliterationName = "fullwidthToHalfwidthLikeASC"; transliterationName = "fullwidthToHalfwidthLikeASC";
implementationName = "com.sun.star.i18n.Transliteration.FULLWIDTH_HALFWIDTH_LIKE_ASC"; implementationName = "com.sun.star.i18n.Transliteration.FULLWIDTH_HALFWIDTH_LIKE_ASC";
......
...@@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star { namespace i18n { ...@@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
halfwidthToFullwidth::halfwidthToFullwidth() halfwidthToFullwidth::halfwidthToFullwidth()
{ {
func = (TransFunc) 0; func = nullptr;
table = &widthfolding::gethalf2fullTable(); table = &widthfolding::gethalf2fullTable();
transliterationName = "halfwidthToFullwidth"; transliterationName = "halfwidthToFullwidth";
implementationName = "com.sun.star.i18n.Transliteration.HALFWIDTH_FULLWIDTH"; implementationName = "com.sun.star.i18n.Transliteration.HALFWIDTH_FULLWIDTH";
...@@ -59,7 +59,7 @@ halfwidthToFullwidth::transliterateChar2Char( sal_Unicode inChar) ...@@ -59,7 +59,7 @@ halfwidthToFullwidth::transliterateChar2Char( sal_Unicode inChar)
halfwidthKatakanaToFullwidthKatakana::halfwidthKatakanaToFullwidthKatakana() halfwidthKatakanaToFullwidthKatakana::halfwidthKatakanaToFullwidthKatakana()
{ {
func = (TransFunc) 0; func = nullptr;
table = &widthfolding::gethalfKana2fullKanaTable(); table = &widthfolding::gethalfKana2fullKanaTable();
transliterationName = "halfwidthKatakanaToFullwidthKatakana"; transliterationName = "halfwidthKatakanaToFullwidthKatakana";
implementationName = "com.sun.star.i18n.Transliteration.HALFWIDTHKATAKANA_FULLWIDTHKATAKANA"; implementationName = "com.sun.star.i18n.Transliteration.HALFWIDTHKATAKANA_FULLWIDTHKATAKANA";
...@@ -89,7 +89,7 @@ halfwidthKatakanaToFullwidthKatakana::transliterateChar2Char( sal_Unicode inChar ...@@ -89,7 +89,7 @@ halfwidthKatakanaToFullwidthKatakana::transliterateChar2Char( sal_Unicode inChar
halfwidthToFullwidthLikeJIS::halfwidthToFullwidthLikeJIS() halfwidthToFullwidthLikeJIS::halfwidthToFullwidthLikeJIS()
{ {
func = (TransFunc) 0; func = nullptr;
table = &widthfolding::gethalf2fullTableForJIS(); table = &widthfolding::gethalf2fullTableForJIS();
transliterationName = "halfwidthToFullwidthLikeJIS"; transliterationName = "halfwidthToFullwidthLikeJIS";
implementationName = "com.sun.star.i18n.Transliteration.HALFWIDTH_FULLWIDTH_LIKE_JIS"; implementationName = "com.sun.star.i18n.Transliteration.HALFWIDTH_FULLWIDTH_LIKE_JIS";
......
...@@ -33,7 +33,7 @@ static const transliteration_Ignore::Mapping BaFa[] = { ...@@ -33,7 +33,7 @@ static const transliteration_Ignore::Mapping BaFa[] = {
ignoreBaFa_ja_JP::ignoreBaFa_ja_JP() ignoreBaFa_ja_JP::ignoreBaFa_ja_JP()
{ {
func = (TransFunc) 0; func = nullptr;
table = 0; table = 0;
map = BaFa; map = BaFa;
transliterationName = "ignoreBaFa_ja_JP"; transliterationName = "ignoreBaFa_ja_JP";
......
...@@ -34,7 +34,7 @@ static const transliteration_Ignore::Mapping HyuByu[] = { ...@@ -34,7 +34,7 @@ static const transliteration_Ignore::Mapping HyuByu[] = {
ignoreHyuByu_ja_JP::ignoreHyuByu_ja_JP() ignoreHyuByu_ja_JP::ignoreHyuByu_ja_JP()
{ {
func = (TransFunc) 0; func = nullptr;
table = 0; table = 0;
map = HyuByu; map = HyuByu;
transliterationName = "ignoreHyuByu_ja_JP"; transliterationName = "ignoreHyuByu_ja_JP";
......
...@@ -39,7 +39,7 @@ static const transliteration_Ignore::Mapping SeZe[] = { ...@@ -39,7 +39,7 @@ static const transliteration_Ignore::Mapping SeZe[] = {
ignoreSeZe_ja_JP::ignoreSeZe_ja_JP() ignoreSeZe_ja_JP::ignoreSeZe_ja_JP()
{ {
func = (TransFunc) 0; func = nullptr;
table = 0; table = 0;
map = SeZe; map = SeZe;
transliterationName = "ignoreSeZe_ja_JP"; transliterationName = "ignoreSeZe_ja_JP";
......
...@@ -100,7 +100,7 @@ OneToOneMappingTable_t ignoreSeparatorTable[] = { ...@@ -100,7 +100,7 @@ OneToOneMappingTable_t ignoreSeparatorTable[] = {
ignoreSeparator_ja_JP::ignoreSeparator_ja_JP() ignoreSeparator_ja_JP::ignoreSeparator_ja_JP()
{ {
static oneToOneMapping _table(ignoreSeparatorTable, sizeof(ignoreSeparatorTable)); static oneToOneMapping _table(ignoreSeparatorTable, sizeof(ignoreSeparatorTable));
func = (TransFunc) 0; func = nullptr;
table = &_table; table = &_table;
map = 0; map = 0;
transliterationName = "ignoreSeparator_ja_JP"; transliterationName = "ignoreSeparator_ja_JP";
......
...@@ -42,7 +42,7 @@ OneToOneMappingTable_t ignoreSpace_ja_JP_mappingTable[] = { ...@@ -42,7 +42,7 @@ OneToOneMappingTable_t ignoreSpace_ja_JP_mappingTable[] = {
ignoreSpace_ja_JP::ignoreSpace_ja_JP() ignoreSpace_ja_JP::ignoreSpace_ja_JP()
{ {
func = (TransFunc)0; func = nullptr;
table = new oneToOneMapping(ignoreSpace_ja_JP_mappingTable, sizeof(ignoreSpace_ja_JP_mappingTable)); table = new oneToOneMapping(ignoreSpace_ja_JP_mappingTable, sizeof(ignoreSpace_ja_JP_mappingTable));
map = 0; map = 0;
transliterationName = "ignoreSpace_ja_JP"; transliterationName = "ignoreSpace_ja_JP";
......
...@@ -43,7 +43,7 @@ static const transliteration_Ignore::Mapping TiJi[] = { ...@@ -43,7 +43,7 @@ static const transliteration_Ignore::Mapping TiJi[] = {
ignoreTiJi_ja_JP::ignoreTiJi_ja_JP() ignoreTiJi_ja_JP::ignoreTiJi_ja_JP()
{ {
func = (TransFunc) 0; func = nullptr;
table = 0; table = 0;
map = TiJi; map = TiJi;
transliterationName = "ignoreTiJi_ja_JP"; transliterationName = "ignoreTiJi_ja_JP";
......
...@@ -722,7 +722,7 @@ OneToOneMappingTable_t traditionalKanji2updateKanji[] = { ...@@ -722,7 +722,7 @@ OneToOneMappingTable_t traditionalKanji2updateKanji[] = {
ignoreTraditionalKanji_ja_JP::ignoreTraditionalKanji_ja_JP() ignoreTraditionalKanji_ja_JP::ignoreTraditionalKanji_ja_JP()
{ {
static oneToOneMapping _table(traditionalKanji2updateKanji, sizeof(traditionalKanji2updateKanji)); static oneToOneMapping _table(traditionalKanji2updateKanji, sizeof(traditionalKanji2updateKanji));
func = (TransFunc)0; func = nullptr;
table = &_table; table = &_table;
map = 0; map = 0;
transliterationName = "ignoreTraditionalKanji_ja_JP"; transliterationName = "ignoreTraditionalKanji_ja_JP";
......
...@@ -69,7 +69,7 @@ OneToOneMappingTable_t large2small[] = { ...@@ -69,7 +69,7 @@ OneToOneMappingTable_t large2small[] = {
largeToSmall_ja_JP::largeToSmall_ja_JP() largeToSmall_ja_JP::largeToSmall_ja_JP()
{ {
static oneToOneMapping _table(large2small, sizeof(large2small)); static oneToOneMapping _table(large2small, sizeof(large2small));
func = (TransFunc) 0; func = nullptr;
table = &_table; table = &_table;
transliterationName = "largeToSmall_ja_JP"; transliterationName = "largeToSmall_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.largeToSmall_ja_JP"; implementationName = "com.sun.star.i18n.Transliteration.largeToSmall_ja_JP";
......
...@@ -69,7 +69,7 @@ OneToOneMappingTable_t small2large[] = { ...@@ -69,7 +69,7 @@ OneToOneMappingTable_t small2large[] = {
smallToLarge_ja_JP::smallToLarge_ja_JP() smallToLarge_ja_JP::smallToLarge_ja_JP()
{ {
static oneToOneMapping _table(small2large, sizeof(small2large)); static oneToOneMapping _table(small2large, sizeof(small2large));
func = (TransFunc) 0; func = nullptr;
table = &_table; table = &_table;
transliterationName = "smallToLarge_ja_JP"; transliterationName = "smallToLarge_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.smallToLarge_ja_JP"; implementationName = "com.sun.star.i18n.Transliteration.smallToLarge_ja_JP";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment