diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-10-23 23:54:08 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-10-23 23:54:08 +0400 |
| commit | 1d77d4eada214e14938336070b248c18705939ff (patch) | |
| tree | 7df2df53e77bb6fa622bfcb3570a8b38325a4a37 /svx | |
| parent | e90e4df7ae3cad005932733dc46c61cef3ec38b3 (diff) | |
typo, wrong object was returned
Change-Id: Ibcb45d7f0ad3f9469c61809528d7542a80d406b7
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdoashp.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 7020d6b9efa5..e3b69ad60200 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -100,7 +100,7 @@ using namespace ::com::sun::star::drawing; // A simple one item cache really helps here ... namespace { static const SdrObjCustomShape *g_pLastCacheShape; - static Reference< XCustomShapeEngine > g_xLastCacheShape; + static Reference< XCustomShapeEngine > g_xLastCacheShapeEngine; } static void lcl_ShapeSegmentFromBinary( EnhancedCustomShapeSegment& rSegInfo, sal_uInt16 nSDat ) @@ -411,7 +411,7 @@ Reference< XCustomShapeEngine > SdrObjCustomShape::GetCustomShapeEngine( const S // We get dozens of back-to-back calls for the same shape if( pCustomShape == g_pLastCacheShape ) - return xCustomShapeEngine; + return g_xLastCacheShapeEngine; String aEngine(((SdrCustomShapeEngineItem&)pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_ENGINE )).GetValue()); if ( !aEngine.Len() ) @@ -436,7 +436,7 @@ Reference< XCustomShapeEngine > SdrObjCustomShape::GetCustomShapeEngine( const S } g_pLastCacheShape = pCustomShape; - g_xLastCacheShape = xCustomShapeEngine; + g_xLastCacheShapeEngine = xCustomShapeEngine; return xCustomShapeEngine; } @@ -868,7 +868,7 @@ SdrObjCustomShape::~SdrObjCustomShape() if (this == g_pLastCacheShape) { g_pLastCacheShape = NULL; - g_xLastCacheShape.clear(); + g_xLastCacheShapeEngine.clear(); } // delete buffered display geometry InvalidateRenderGeometry(); |