chart2/Library_chartopengl.mk | 9 +++++++--
chart2/inc/pch/precompiled_chartopengl.cxx | 18 ++++++++++++++++++
chart2/inc/pch/precompiled_chartopengl.hxx | 12 ++++++++++++
chart2/source/tools/AxisHelper.cxx | 2 +-
chart2/source/tools/ExplicitCategoriesProvider.cxx | 2 +-
chart2/source/view/inc/DummyXShape.hxx | 8 ++++++--
chart2/source/view/main/DummyXShape.cxx | 9 +++++++--
chart2/source/view/main/OpenglShapeFactory.cxx | 2 +-
8 files changed, 53 insertions(+), 9 deletions(-)
New commits:
commit cea891e1a8207ba3cbf48ff95750323b44dfa50b
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Wed Oct 23 10:00:37 2013 +0200
fix tests
Change-Id: Ib090d9a6a007a738a0603d1d0a38d5b274feadcc
diff --git a/chart2/source/tools/AxisHelper.cxx
b/chart2/source/tools/AxisHelper.cxx
index 6bbf472..4b372ca 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -151,7 +151,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
//check whether we have a percent scale -> use percent format
if( xNumberFormatsSupplier.is() )
{
- ChartModel* pModel = dynamic_cast<ChartModel*>(
xNumberFormatsSupplier.get() );
+ ChartModel* pModel = dynamic_cast<ChartModel*>( xChartDoc.get() );
assert(pModel);
ScaleData aData = AxisHelper::getDateCheckedScale( xAxis, *pModel
);
if( aData.AxisType==AxisType::PERCENT )
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx
b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 7d57947..4a5eade 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -187,7 +187,7 @@ void ExplicitCategoriesProvider::convertCategoryAnysToText(
uno::Sequence< OUStr
{
Reference< chart2::XAxis > xAxis(
xCooSysModel->getAxisByDimension(0,0) );
nAxisNumberFormat = AxisHelper::getExplicitNumberFormatKeyForAxis(
- xAxis, xCooSysModel, rModel.getNumberFormatsSupplier(),
false );
+ xAxis, xCooSysModel, uno::Reference< util::XNumberFormatsSupplier>
(static_cast< ::cppu::OWeakObject* >( &rModel ), uno::UNO_QUERY), false );
}
sal_Int32 nLabelColor;
commit c694b21bf057a0e3ba8b7d7c206f487973a4bf04
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Tue Oct 22 21:06:08 2013 +0200
fix the windows build
Change-Id: Ie3625211a32c41dd0fadf94294bc689aef7b1c24
diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk
index f972353..f8473eb 100644
--- a/chart2/Library_chartopengl.mk
+++ b/chart2/Library_chartopengl.mk
@@ -47,6 +47,8 @@ $(eval $(call gb_Library_add_exception_objects,chartopengl,\
ifeq ($(strip $(OS)),WNT)
$(eval $(call gb_Library_use_system_win32_libs,chartopengl,\
opengl32 \
+ gdi32 \
+ glu32 \
))
else ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_libs,chartopengl,\
diff --git a/chart2/source/view/inc/DummyXShape.hxx
b/chart2/source/view/inc/DummyXShape.hxx
index 5ee75e5..aed200c 100644
--- a/chart2/source/view/inc/DummyXShape.hxx
+++ b/chart2/source/view/inc/DummyXShape.hxx
@@ -397,8 +397,6 @@ public:
DummyChart();
virtual DummyChart* getRootShape();
- OpenglContext* getGlContext() { return mpContext; }
-
virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point&
aPosition ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize )
throw(::com::sun::star::beans::PropertyVetoException,
::com::sun::star::uno::RuntimeException);
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index 164c10f4..b1eb93f 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -208,9 +208,10 @@ void DummyXShape::setParent( const uno::Reference<
uno::XInterface >& xParent )
namespace {
-void setProperties( uno::Reference< beans::XPropertySet > xPropSet, const
tPropertyNameMap& rPropertyNameMap,
- std::map<OUString, uno::Any>& rTargetMap )
+void setProperties( uno::Reference< beans::XPropertySet > , const
tPropertyNameMap& ,
+ std::map<OUString, uno::Any>& )
{
+/*
tNameSequence aNames;
tAnySequence aValues;
PropertyMapper::getMultiPropertyLists( aNames, aValues,
@@ -221,6 +222,7 @@ void setProperties( uno::Reference< beans::XPropertySet >
xPropSet, const tPrope
{
rTargetMap[aNames[i]] = aValues[i];
}
+*/
}
}
@@ -682,6 +684,7 @@ bool DummyChart::initWindow()
return true;
}
+#if defined( UNX )
namespace {
@@ -695,6 +698,8 @@ int oglErrorHandler( unx::Display* /*dpy*/,
unx::XErrorEvent* /*evnt*/ )
}
+#endif
+
bool DummyChart::initOpengl()
{
initWindow();
commit db705f07d2f140aa2aeb1dfc143aa5c689986c92
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Tue Oct 22 20:20:50 2013 +0200
more windows build fixes
Change-Id: I79b75bbb193851855328a7dbbd8ab547afe29aec
diff --git a/chart2/source/view/inc/DummyXShape.hxx
b/chart2/source/view/inc/DummyXShape.hxx
index d4147de..5ee75e5 100644
--- a/chart2/source/view/inc/DummyXShape.hxx
+++ b/chart2/source/view/inc/DummyXShape.hxx
@@ -58,6 +58,12 @@
#include <map>
#include <boost/scoped_ptr.hpp>
+#if defined( _WIN32 )
+#include "prewin.h"
+#include "windows.h"
+#include "postwin.h"
+#endif
+
#include <GL/gl.h>
#include <GL/glu.h>
commit 1c8db5c996fcd5fb4afdc0ef94f3f7b0bb421461
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Tue Oct 22 20:00:30 2013 +0200
fix windows build
Change-Id: I51942eb3719459abc0353a7fd024784f2c4abdb3
diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk
index 0aa88e7b0..f972353 100644
--- a/chart2/Library_chartopengl.mk
+++ b/chart2/Library_chartopengl.mk
@@ -17,6 +17,11 @@ $(eval $(call gb_Library_set_include,chartopengl,\
$$(INCLUDE) \
))
+$(eval $(call gb_Library_use_externals,chartopengl,\
+ boost_headers \
+ mdds_headers \
+))
+
$(eval $(call gb_Library_use_sdk_api,chartopengl))
$(eval $(call gb_Library_use_externals,chartopengl,\
@@ -33,8 +38,6 @@ $(eval $(call gb_Library_use_libraries,chartopengl,\
$(gb_UWINAPI) \
))
-$(eval $(call
gb_Library_set_precompiled_header,chartopengl,$(SRCDIR)/chart2/inc/pch/precompiled_chartopengl))
-
$(eval $(call gb_Library_add_exception_objects,chartopengl,\
chart2/source/glew/glew \
chart2/source/view/main/OpenglShapeFactory \
diff --git a/chart2/inc/pch/precompiled_chartopengl.cxx
b/chart2/inc/pch/precompiled_chartopengl.cxx
new file mode 100755
index 0000000..f05ecff
--- /dev/null
+++ b/chart2/inc/pch/precompiled_chartopengl.cxx
@@ -0,0 +1,18 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/*
+ This file has been autogenerated by update_pch.sh . It is possible to edit it
+ manually (such as when an include file has been moved/renamed/removed. All
such
+ manual changes will be rewritten by the next run of update_pch.sh (which
presumably
+ also fixes all possible problems, so it's usually better to use it).
+*/
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/inc/pch/precompiled_chartopengl.hxx
b/chart2/inc/pch/precompiled_chartopengl.hxx
new file mode 100755
index 0000000..8446c33
--- /dev/null
+++ b/chart2/inc/pch/precompiled_chartopengl.hxx
@@ -0,0 +1,12 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "precompiled_chartopengl.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx
b/chart2/source/view/main/OpenglShapeFactory.cxx
index e535a25..2f4b6cf 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -59,7 +59,7 @@ using ::com::sun::star::uno::Reference;
namespace chart
{
-SAL_CALL extern "C" {
+extern "C" {
SAL_DLLPUBLIC_EXPORT opengl::OpenglShapeFactory* getOpenglShapeFactory()
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
