mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oglcanvas: ship comp registration, return device window.

Browse Source 
Change-Id: I6c7e9416f908fd3b903eaef82492c1f4445b4e0c
This commit is contained in:
Thorsten Behrens 2013-10-08 10:59:38 +02:00 committed by Thorsten Behrens
parent 829752d315
commit 1aae965d44
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
canvas/source/opengl/ogl_spritedevicehelper.cxx
View File

@ -956,7 +956,7 @@ namespace oglcanvas
uno::Any SpriteDeviceHelper::getDeviceHandle() const uno::Any SpriteDeviceHelper::getDeviceHandle() const
{ {
return uno::Any(); return uno::makeAny( reinterpret_cast< sal_Int64 >(mpChildWindow.get()) );
} }
uno::Any SpriteDeviceHelper::getSurfaceHandle() const uno::Any SpriteDeviceHelper::getSurfaceHandle() const

3
postprocess/Rdb_services.mk
View File

@ -183,6 +183,9 @@ $(eval $(call gb_Rdb_add_components,services,\
canvas/source/directx/directx9canvas \ canvas/source/directx/directx9canvas \
canvas/source/directx/gdipluscanvas \ canvas/source/directx/gdipluscanvas \
) \ ) \
$(if $(ENABLE_OPENGL_CANVAS), \
canvas/source/opengl/oglcanvas \
) \
$(if $(ENABLE_GCONF), \ $(if $(ENABLE_GCONF), \
shell/source/backends/gconfbe/gconfbe1 \ shell/source/backends/gconfbe/gconfbe1 \
) \ ) \