sw/source/uibase/config/viewopt.cxx | 2 +- vcl/workben/fftester.cxx | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-)
New commits: commit 6f9ecd154a5812fa4757f8f4f408c80f671b2850 Author: Noel Grandin <n...@peralex.com> Date: Thu Aug 20 10:57:13 2015 +0200 loplugin:implicitboolconversion Change-Id: I8d44cca45340bc6c204308cef7e17907ea7a7c67 diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx index 03e4c9f..e3d3ffc 100644 --- a/vcl/workben/fftester.cxx +++ b/vcl/workben/fftester.cxx @@ -103,31 +103,31 @@ try_again: { GDIMetaFile aGDIMetaFile; SvFileStream aFileStream(out, StreamMode::READ); - ret = ReadWindowMetafile(aFileStream, aGDIMetaFile); + ret = (int) ReadWindowMetafile(aFileStream, aGDIMetaFile); } else if (strcmp(argv[2], "jpg") == 0) { Graphic aGraphic; SvFileStream aFileStream(out, StreamMode::READ); - ret = ImportJPEG(aFileStream, aGraphic, NULL, GraphicFilterImportFlags::NONE); + ret = (int) ImportJPEG(aFileStream, aGraphic, NULL, GraphicFilterImportFlags::NONE); } else if (strcmp(argv[2], "gif") == 0) { SvFileStream aFileStream(out, StreamMode::READ); Graphic aGraphic; - ret = ImportGIF(aFileStream, aGraphic); + ret = (int) ImportGIF(aFileStream, aGraphic); } else if (strcmp(argv[2], "xbm") == 0) { Graphic aGraphic; SvFileStream aFileStream(out, StreamMode::READ); - ret = ImportXBM(aFileStream, aGraphic); + ret = (int) ImportXBM(aFileStream, aGraphic); } else if (strcmp(argv[2], "xpm") == 0) { Graphic aGraphic; SvFileStream aFileStream(out, StreamMode::READ); - ret = ImportXPM(aFileStream, aGraphic); + ret = (int) ImportXPM(aFileStream, aGraphic); } else if (strcmp(argv[2], "png") == 0) { @@ -139,7 +139,7 @@ try_again: { Bitmap aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = ReadDIB(aTarget, aFileStream, true); + ret = (int) ReadDIB(aTarget, aFileStream, true); } else if (strcmp(argv[2], "svm") == 0) { @@ -160,7 +160,7 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); } else if (strcmp(argv[2], "dxf") == 0) { @@ -175,7 +175,7 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); } else if (strcmp(argv[2], "met") == 0) { @@ -190,7 +190,7 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); } else if ((strcmp(argv[2], "pbm") == 0) || strcmp(argv[2], "ppm") == 0) { @@ -205,7 +205,7 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); } else if (strcmp(argv[2], "psd") == 0) { @@ -220,7 +220,7 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); } else if (strcmp(argv[2], "eps") == 0) { @@ -235,7 +235,7 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); } else if (strcmp(argv[2], "pct") == 0) { @@ -250,7 +250,7 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); } else if (strcmp(argv[2], "pcx") == 0) { @@ -265,7 +265,7 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); } else if (strcmp(argv[2], "ras") == 0) { @@ -280,7 +280,7 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); } else if (strcmp(argv[2], "tga") == 0) { @@ -295,7 +295,7 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); } else if (strcmp(argv[2], "tif") == 0) { @@ -310,7 +310,7 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); } else if (strcmp(argv[2], "doc") == 0) { @@ -323,7 +323,7 @@ try_again: aLibrary.getFunctionSymbol("TestImportDOC")); aLibrary.release(); } - ret = (*pfnImport)(out); + ret = (int) (*pfnImport)(out); } } commit 77634c4cfd25f3849419f943921e53f80dfd1799 Author: Noel Grandin <n...@peralex.com> Date: Thu Aug 20 10:39:50 2015 +0200 loplugin:simplifybool Change-Id: I7bb930f3b062dda9e46f517a1ea1dacb0d64de7f diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx index 9bd36e8..6f29c45 100644 --- a/sw/source/uibase/config/viewopt.cxx +++ b/sw/source/uibase/config/viewopt.cxx @@ -200,7 +200,7 @@ SwViewOption::SwViewOption() : aSnapSize.Width() = aSnapSize.Height() = 567; // 1 cm nDivisionX = nDivisionY = 1; - bSelectionInReadonly = !utl::ConfigManager::IsAvoidConfig() ? SW_MOD()->GetAccessibilityOptions().IsSelectionInReadonly() : false; + bSelectionInReadonly = !utl::ConfigManager::IsAvoidConfig() && SW_MOD()->GetAccessibilityOptions().IsSelectionInReadonly(); bIdle = true; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits