[Libreoffice-commits] core.git: 2 commits - canvas/source sc/source

[Caolán McNamara]

 canvas/source/directx/dx_textlayout_drawhelper.cxx |    4 ++--
 sc/source/filter/starcalc/scflt.cxx                |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f5607f7a440cc54a0a48582ae05c817c8c306b71
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 11 21:07:53 2014 +0000

    only checked for new VirtualDevice
    
    Change-Id: I64d7a3c6c0894e231cb0644922675dcce0db89fa

diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index ec20731..15883c6 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -86,7 +86,7 @@ namespace dxcanvas
         SystemGraphicsData aSystemGraphicsData;
         aSystemGraphicsData.nSize = sizeof(SystemGraphicsData);
         aSystemGraphicsData.hDC = reinterpret_cast< ::HDC >(hdc);
-        VirtualDevice aVirtualDevice(&aSystemGraphicsData, 0);
+        VirtualDevice aVirtualDevice(&aSystemGraphicsData, Size(1, 1), 0);
 
         // disable font antialiasing - GDI does not handle alpha
         // surfaces properly.
@@ -242,7 +242,7 @@ namespace dxcanvas
         SystemGraphicsData aSystemGraphicsData;
         aSystemGraphicsData.nSize = sizeof(SystemGraphicsData);
         aSystemGraphicsData.hDC = reinterpret_cast< ::HDC >(GetDC( NULL ));
-        VirtualDevice aVirtualDevice(&aSystemGraphicsData, 0);
+        VirtualDevice aVirtualDevice(&aSystemGraphicsData, Size(1, 1), 0);
 
         // create the font
         const ::com::sun::star::rendering::FontRequest& rFontRequest = rCanvasFont->getFontRequest();
commit 0741a86d4bf87c6231bc2e02ee41b00d19a0695e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 11 21:05:40 2014 +0000

    coverity#1242939 Untrusted value as argument
    
    Change-Id: I7d93f9ef4a0821ee3ab9526abd90b8aefe895ded

diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index 870a68f..25b350d 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -2310,8 +2310,8 @@ void Sc10Import::LoadObjects()
         nStartX += (long) ( GraphHeader.x / nPPTX * HMM_PER_TWIPS );
         long nSizeX = (long) ( GraphHeader.w / nPPTX * HMM_PER_TWIPS );
         long nStartY = pDoc->GetRowHeight( 0,
-                static_cast<SCsROW>(GraphHeader.CarretY) - 1,
-                static_cast<SCTAB>(GraphHeader.CarretZ));
+                SanitizeRow(static_cast<SCsROW>(GraphHeader.CarretY) - 1),
+                SanitizeTab(static_cast<SCTAB>(GraphHeader.CarretZ)));
         nStartY = (long) ( nStartY * HMM_PER_TWIPS );
         nStartY += (long) ( GraphHeader.y / nPPTY * HMM_PER_TWIPS );
         long nSizeY = (long) ( GraphHeader.h / nPPTY * HMM_PER_TWIPS );