Kaydet (Commit) 35b6d311 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

fix crash in opengl backend

Change-Id: I1257f4568e55ca545e96bda8a53f272ba8e1f0b0
üst 78fb95ee
...@@ -100,7 +100,7 @@ class DummyChart; ...@@ -100,7 +100,7 @@ class DummyChart;
struct OpenglContext; struct OpenglContext;
class DummyXShape : public cppu::WeakImplHelper6< class DummyXShape : public cppu::WeakAggImplHelper6<
::com::sun::star::drawing::XShape, ::com::sun::star::drawing::XShape,
com::sun::star::beans::XPropertySet, com::sun::star::beans::XPropertySet,
com::sun::star::beans::XMultiPropertySet, com::sun::star::beans::XMultiPropertySet,
...@@ -364,6 +364,7 @@ class DummyXShapes : public DummyXShape, public com::sun::star::drawing::XShapes ...@@ -364,6 +364,7 @@ class DummyXShapes : public DummyXShape, public com::sun::star::drawing::XShapes
public: public:
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
virtual com::sun::star::uno::Any SAL_CALL queryAggregation( const com::sun::star::uno::Type& rType ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL acquire() throw();
virtual void SAL_CALL release() throw(); virtual void SAL_CALL release() throw();
......
...@@ -396,12 +396,29 @@ DummyChart* DummyChart::getRootShape() ...@@ -396,12 +396,29 @@ DummyChart* DummyChart::getRootShape()
return this; return this;
} }
#define QUERYINT( xint ) \
if( rType == ::getCppuType((const uno::Reference< xint >*)0) ) \
aAny <<= uno::Reference< xint >(this)
uno::Any DummyXShapes::queryInterface( const uno::Type& rType ) uno::Any DummyXShapes::queryInterface( const uno::Type& rType )
throw(uno::RuntimeException) throw(uno::RuntimeException)
{ {
return DummyXShape::queryInterface(rType); return DummyXShape::queryInterface(rType);
} }
uno::Any DummyXShapes::queryAggregation( const uno::Type & rType )
throw(uno::RuntimeException)
{
uno::Any aAny;
//QUERYINT( drawing::XShapeGroup );
QUERYINT( drawing::XShapes );
else
return DummyXShape::queryAggregation( rType );
return aAny;
}
void DummyXShapes::acquire() void DummyXShapes::acquire()
throw() throw()
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment