diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-10-22 21:06:08 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-11-19 13:47:40 +0100 |
| commit | 1c6b94c78e6c77eeaf279903d146fdc157007fa9 (patch) | |
| tree | 8e5a46b9a4e74a4bf10820f22ffd4997bfa477c6 /chart2 | |
| parent | ea306793cc283ab95b69e1c6df8cd74967fa064e (diff) | |
fix the windows build
Change-Id: Ie3625211a32c41dd0fadf94294bc689aef7b1c24
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/Library_chartopengl.mk | 2 | ||||
| -rw-r--r-- | chart2/source/view/inc/DummyXShape.hxx | 2 | ||||
| -rw-r--r-- | chart2/source/view/main/DummyXShape.cxx | 9 |
3 files changed, 9 insertions, 4 deletions
diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk index f972353c8ffd..f8473eb3100e 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 5ee75e5e2bad..aed200c5b66d 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 164c10f4758a..b1eb93ff6761 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(); |