chart2/source/view/main/GL3DRenderer.cxx | 2 +- sc/source/ui/view/tabvwsh4.cxx | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)
New commits: commit 49bad83f25f6bc186721849edb0c78990a33e100 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); commit 973f75538aef108fadaa339adef94220dab1dbe1 Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk> Date: Fri May 23 17:32:54 2014 +0200 we don't want the debug rendering enabled Change-Id: Id7b9152b946dbef3349b825a8f094bd9d07445f2 diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx index e5e08d3..19b8c6f 100644 --- a/chart2/source/view/main/GL3DRenderer.cxx +++ b/chart2/source/view/main/GL3DRenderer.cxx @@ -20,7 +20,7 @@ #include <StaticGeometry.h> #include "glm/gtc/matrix_inverse.hpp" -#define DEBUG_FBO 1 +#define DEBUG_FBO 0 #define GL_PI 3.14159f _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits