[Libreoffice-commits] core.git: Branch 'feature/chart-opengl' - chart2/source

Markus Mohrhard markus.mohrhard at googlemail.com
Tue Dec 17 16:40:41 PST 2013


 chart2/source/view/main/OpenglShapeFactory.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 68424f8994f4fa19920322d7f3f0a8f0313b0998
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Dec 18 01:38:28 2013 +0100

    fix weird issue on windows with OPTIONAL being defined somewhere
    
    WTF!!!!!!!!!!!!! Who had the glorious idea to provide a define for OPTIONAL when we use it internally as well
    
    Change-Id: I257f82b62978c73c84faa34c8b341d77c017425e

diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx b/chart2/source/view/main/OpenglShapeFactory.cxx
index dc0f776..70bc1b5 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <svx/unoshape.hxx>
 #include "OpenglShapeFactory.hxx"
 #include "DummyXShape.hxx"
 #include "ViewDefines.hxx"
@@ -46,7 +47,6 @@
 #include <rtl/math.hxx>
 #include <svx/svdocirc.hxx>
 #include <svx/svdopath.hxx>
-#include <svx/unoshape.hxx>
 
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/matrix/b3dhommatrix.hxx>


More information about the Libreoffice-commits mailing list