[Libreoffice-commits] core.git: include/vcl sc/source vcl/source

[Chris Sherlock]

 include/vcl/ITiledRenderable.hxx  |    4 ++--
 sc/source/ui/unoobj/docuno.cxx    |   24 ++++++++++++------------
 vcl/source/filter/jpeg/transupp.c |    2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 3f787ee4ad062fc5c14d783140a1d9d67e79af41
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Fri Jan 8 15:47:42 2016 +1100

    vcl: fix WaE messages
    
    Change-Id: Ib861efdaa9e18a22fb967bcef251792c9b9f5768
    Reviewed-on: https://gerrit.libreoffice.org/21240
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>

diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index ba77330..a1e1d80 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -23,8 +23,8 @@ namespace vcl
 class VCL_DLLPUBLIC ITiledRenderable
 {
 protected:
-    int nTilePixelWidth, nTilePixelHeight;
-    int nTileTwipWidth, nTileTwipHeight;
+    int mnTilePixelWidth, mnTilePixelHeight;
+    int mnTileTwipWidth, mnTileTwipHeight;
 public:
     virtual ~ITiledRenderable();
 
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 2bdab21..18fe18d 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -603,8 +603,8 @@ void ScModelObj::postMouseEvent(int nType, int nX, int nY, int nCount, int nButt
         return;
 
     // update the aLogicMode in ScViewData to something predictable
-    pViewData->SetZoom(Fraction(nTilePixelWidth * TWIPS_PER_PIXEL, nTileTwipWidth),
-                       Fraction(nTilePixelHeight * TWIPS_PER_PIXEL, nTileTwipHeight), true);
+    pViewData->SetZoom(Fraction(mnTilePixelWidth * TWIPS_PER_PIXEL, mnTileTwipWidth),
+                       Fraction(mnTilePixelHeight * TWIPS_PER_PIXEL, mnTileTwipHeight), true);
 
     // Calc operates in pixels...
     MouseEvent aEvent(Point(nX * pViewData->GetPPTX(), nY * pViewData->GetPPTY()), nCount,
@@ -874,10 +874,10 @@ bool ScModelObj::isMimeTypeSupported()
 
 void ScModelObj::setClientZoom(int nTilePixelWidth_, int nTilePixelHeight_, int nTileTwipWidth_, int nTileTwipHeight_)
 {
-    nTilePixelWidth = nTilePixelWidth_;
-    nTilePixelHeight = nTilePixelHeight_;
-    nTileTwipWidth = nTileTwipWidth_;
-    nTileTwipHeight = nTileTwipHeight_;
+    mnTilePixelWidth = nTilePixelWidth_;
+    mnTilePixelHeight = nTilePixelHeight_;
+    mnTileTwipWidth = nTileTwipWidth_;
+    mnTileTwipHeight = nTileTwipHeight_;
 }
 
 OUString ScModelObj::getRowColumnHeaders(const Rectangle& rRectangle)
@@ -888,8 +888,8 @@ OUString ScModelObj::getRowColumnHeaders(const Rectangle& rRectangle)
         return OUString();
 
     // update the aLogicMode in ScViewData to something predictable
-    pViewData->SetZoom(Fraction(nTilePixelWidth * TWIPS_PER_PIXEL, nTileTwipWidth),
-                       Fraction(nTilePixelHeight * TWIPS_PER_PIXEL, nTileTwipHeight), true);
+    pViewData->SetZoom(Fraction(mnTilePixelWidth * TWIPS_PER_PIXEL, mnTileTwipWidth),
+                       Fraction(mnTilePixelHeight * TWIPS_PER_PIXEL, mnTileTwipHeight), true);
 
     ScTabView* pTabView = pViewData->GetView();
     if (!pTabView)
@@ -942,11 +942,11 @@ void ScModelObj::initializeForTiledRendering(const css::uno::Sequence<css::beans
     pDocShell->CalcOutputFactor();
 
     // default tile size in pixels
-    nTilePixelWidth = 256;
-    nTilePixelHeight = 256;
+    mnTilePixelWidth = 256;
+    mnTilePixelHeight = 256;
     // the default zoom level will be 1
-    nTileTwipWidth = nTilePixelWidth * TWIPS_PER_PIXEL;
-    nTileTwipHeight = nTilePixelHeight * TWIPS_PER_PIXEL;
+    mnTileTwipWidth = mnTilePixelWidth * TWIPS_PER_PIXEL;
+    mnTileTwipHeight = mnTilePixelHeight * TWIPS_PER_PIXEL;
 }
 
 uno::Any SAL_CALL ScModelObj::queryInterface( const uno::Type& rType )
diff --git a/vcl/source/filter/jpeg/transupp.c b/vcl/source/filter/jpeg/transupp.c
index e9fbbd0..4530be0 100644
--- a/vcl/source/filter/jpeg/transupp.c
+++ b/vcl/source/filter/jpeg/transupp.c
@@ -16,7 +16,7 @@
 
 #include <sal/config.h>
 
-#include "jinclude.h"
+#include "filter/jinclude.h"
 #include "jerror.h"
 #include "jpeglib.h"
 #include "filter/transupp.h"       /* My own external interface */