[Libreoffice-commits] core.git: 6 commits - chart2/source sc/source sdext/source sd/source svx/source xmloff/source
Norbert Thiebaud
nthiebaud at gmail.com
Sat Oct 4 07:37:03 PDT 2014
chart2/source/view/charttypes/GL3DBarChart.cxx | 2 +-
sc/source/ui/navipi/navipi.cxx | 5 +++--
sd/source/filter/ppt/pptin.cxx | 4 ++--
sdext/source/presenter/PresenterHelpView.cxx | 4 ++--
svx/source/unodraw/UnoGraphicExporter.cxx | 4 ++--
xmloff/source/core/ProgressBarHelper.cxx | 2 +-
6 files changed, 11 insertions(+), 10 deletions(-)
New commits:
commit 4fcde7bbe932e3a6e66b1f3ee10c1fbbd66de79b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Oct 2 05:28:18 2014 -0500
coverity#1242413: logically dead code
Change-Id: I6e5e5025df4ad8eef6ff6a7910cb9c3ab5fc3c4e
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 5881dc2..e37baa1 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -527,8 +527,9 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(
{
case NAV_LMODE_DOCS: nCmdId = IID_DOCS; break;
case NAV_LMODE_AREAS: nCmdId = IID_AREAS; break;
- case NAV_LMODE_DBAREAS: nCmdId = IID_DBAREAS; break;
- case NAV_LMODE_SCENARIOS: nCmdId = IID_SCENARIOS; break;
+// The follwing case can never be reach due to how eNavMode is set-up
+// case NAV_LMODE_DBAREAS: nCmdId = IID_DBAREAS; break;
+// case NAV_LMODE_SCENARIOS: nCmdId = IID_SCENARIOS; break;
default: nCmdId = 0;
}
if (nCmdId)
commit 64d164875fca205294e2ba6f3ce46d392dcfc5cf
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Oct 2 04:46:55 2014 -0500
coverity#1242759 Result is not floating-point
Change-Id: I3a358722279d574f96a2270b5dee84b85ddb402f
diff --git a/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx
index a530970..fcf2df5 100644
--- a/xmloff/source/core/ProgressBarHelper.cxx
+++ b/xmloff/source/core/ProgressBarHelper.cxx
@@ -48,7 +48,7 @@ sal_Int32 ProgressBarHelper::ChangeReference(sal_Int32 nNewReference)
{
if (nReference)
{
- double fPercent(nNewReference / nReference);
+ double fPercent((double)nNewReference / nReference);
double fValue(nValue * fPercent);
nValue = static_cast<sal_Int32>(fValue);
nReference = nNewReference;
commit 164bd64255d71d96e35e908f6425acf8372795fb
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Oct 2 04:44:33 2014 -0500
coverity#1242757 Result is not floating-point
Change-Id: Iae8ac2ad9d1713512619c5c33eeee9a21b5835f1
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 8f35f43..fde8729 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2445,8 +2445,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
if (std::abs(aLogicRect.Right() - aOutlineRect.Right()) > MAX_USER_MOVE ||
std::abs(aLogicRect.Top() - aOutlineRect.Top()) > MAX_USER_MOVE ||
std::abs(aLogicRect.Bottom() - aOutlineRect.Bottom()) > MAX_USER_MOVE ||
- aLogicSize.Width() / aOutlineSize.Width() < 0.48 ||
- aLogicSize.Width() / aOutlineSize.Width() > 0.5)
+ (double)aLogicSize.Width() / aOutlineSize.Width() < 0.48 ||
+ (double)aLogicSize.Width() / aOutlineSize.Width() > 0.5)
{
pPresObj->SetUserCall( NULL );
}
commit 208861d5c7bb2d01597a4c77c4a0d9cc865dd851
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Oct 2 04:42:26 2014 -0500
coverity#1242737 Result is not floating-point
Change-Id: Ic466b5a8e4f5221248c6733fc7fbd0c98c0bd45f
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 75a38be..6e9ab22 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -687,8 +687,8 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
else
nHeightPix = aSizePix.Height();
- double fWidthDif = aSizePix.Width() / nWidthPix;
- double fHeightDif = aSizePix.Height() / nHeightPix;
+ double fWidthDif = (double)aSizePix.Width() / nWidthPix;
+ double fHeightDif = (double)aSizePix.Height() / nHeightPix;
if (fWidthDif > fHeightDif)
nHeightPix = static_cast<long>(aSizePix.Height() / fWidthDif);
commit c626e496b21291ef2b4d023bb75ce3af32065324
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Oct 2 04:41:02 2014 -0500
coverity#1242729 Result is not floating-point
Change-Id: I7a1c8c964dc05d90ac6f15affe75ed14c79c0eb0
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx
index ea3c084..ec5855d 100755
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -1112,7 +1112,7 @@ void GL3DBarChart::scroll(long nDelta)
(maRenderEvent != EVENT_AUTO_FLY) && (maRenderEvent != EVENT_SHOW_SELECT))
return;
glm::vec3 maDir = glm::normalize(maCameraPosition - maCameraDirection);
- maCameraPosition -= (float((nDelta/10)) * maDir);
+ maCameraPosition -= ((float)nDelta/10) * maDir;
mpCamera->setPosition(maCameraPosition);
if(mbBenchMarkMode)
{
commit 51183d5ab6d83667dcf761dad05105d7341936a1
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Oct 2 04:35:31 2014 -0500
coverity#1242725 Result is not floating-point
Change-Id: I007ef5efa07f9124a08e049bca01aac87acfa48e
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index 3787d75..c7a429c 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -291,8 +291,8 @@ void PresenterHelpView::Paint (const awt::Rectangle& rUpdateBox)
PresenterCanvasHelper::SetDeviceColor(aRenderState, mpFont->mnColor);
mxCanvas->drawLine(
- geometry::RealPoint2D(aWindowBox.Width/2, gnVerticalBorder),
- geometry::RealPoint2D(aWindowBox.Width/2, mnSeparatorY - gnVerticalBorder),
+ geometry::RealPoint2D((double)(aWindowBox.Width/2), gnVerticalBorder),
+ geometry::RealPoint2D((double)(aWindowBox.Width/2), mnSeparatorY - gnVerticalBorder),
aViewState,
aRenderState);
More information about the Libreoffice-commits
mailing list