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

[Markus Mohrhard]

 chart2/source/view/main/GL3DRenderer.cxx |    2 +-
 sc/source/ui/view/tabvwsh4.cxx           |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit c2ce981dfb40c36797620e8d026f616571b98082
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Fri May 23 17:36:40 2014 +0200

    don't enable debug renderingto png
    
    Change-Id: Ib15c3fb2f2dd61a9bbab9b6c47866e15c8a7659a

diff --git a/chart2/source/view/main/GL3DRenderer.cxx 
b/chart2/source/view/main/GL3DRenderer.cxx
index 6b96b5f..b2db1e7 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -21,7 +21,7 @@
 #include "glm/gtc/matrix_inverse.hpp"
 #include <boost/checked_delete.hpp>
 
-#define DEBUG_FBO 1
+#define DEBUG_FBO 0
 
 #define GL_PI 3.14159f
 
commit 77b320118b4ce837d038d6cb8eabb1d959010ae8
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date:   Fri May 23 17:33:39 2014 +0200

    we need to map 100th mm to pixel also for the import
    
    Change-Id: I09084d67283b10e024ed926dc0e8d38030d28713

diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 01c171d..7a3a35f 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -545,10 +545,11 @@ void ScTabViewShell::AddOpenGLChartWindows()
         OpenGLWindow* pOpenGLWindow = new OpenGLWindow(pParentWindow);
         pOpenGLWindow->Show(false);
         Size aSize = itr->second.GetSize();
+        Size aWindowSize = pOpenGLWindow->LogicToPixel( aSize, MapMode( 
MAP_100TH_MM ) );
 
-        pOpenGLWindow->SetSizePixel(aSize);
+        pOpenGLWindow->SetSizePixel(aWindowSize);
         Point aPos = itr->second.TopLeft();
-        pOpenGLWindow->SetPosPixel(aPos);
+        pOpenGLWindow->SetPosPixel(pOpenGLWindow->LogicToPixel(aPos, 
MapMode(MAP_100TH_MM)));
         pParentWindow->AddChildWindow(pOpenGLWindow);
         uno::Reference< chart2::X3DChartWindowProvider > x3DWindowProvider( 
itr->first, uno::UNO_QUERY_THROW );
         sal_uInt64 nWindowPtr = reinterpret_cast<sal_uInt64>(pOpenGLWindow);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits