diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-12-17 19:55:32 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-12-17 20:01:27 +0000 |
| commit | 51ecd2f55d608f853852335808b643f61b9a844e (patch) | |
| tree | cbd09f60db611f8ee1c0b2c9291a3e187bd8737b /svx/inc | |
| parent | 9fc8010b757b6ea88370ad0065209e08656a9a76 (diff) | |
fdo#58399 - revert attempts to untangle and accelerate this mess.
Reverts commits:
76350361f386b78e1bc9edb75af89e7ff3afe356
67f899e1d2db0dccde4b9587a52b7157fe1fb0be
1d77d4eada214e14938336070b248c18705939ff
1d16f59023b1b19d01ca69b8c9735be6d3baf5d9
The bug has a great series of linked bugs and stack-traces; the
weakref / mixed tools & UNO lifecycle here is simply hideous.
Diffstat (limited to 'svx/inc')
| -rw-r--r-- | svx/inc/svx/svdoashp.hxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx index 987132f9b7a5..847ebf1660e6 100644 --- a/svx/inc/svx/svdoashp.hxx +++ b/svx/inc/svx/svdoashp.hxx @@ -92,12 +92,10 @@ public: com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mXRenderedCustomShape; - mutable com::sun::star::uno::Reference< com::sun::star::drawing::XCustomShapeEngine > mxCustomShapeEngine; - // #i37011# render geometry shadow SdrObject* mpLastShadowGeometry; - com::sun::star::uno::Reference< com::sun::star::drawing::XCustomShapeEngine > GetCustomShapeEngine() const; + static com::sun::star::uno::Reference< com::sun::star::drawing::XCustomShapeEngine > GetCustomShapeEngine( const SdrObjCustomShape* pCustomShape ); // SVX_DLLPRIVATE com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::drawing::XCustomShapeHandle > > // SdrObjCustomShape::GetInteraction( const SdrObjCustomShape* pCustomShape ) const; |