diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de (CIB)> | 2018-03-15 11:32:00 +0100 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@cib.de (CIB)> | 2018-03-17 23:15:49 +0100 |
| commit | 86c4672f4600daf19238ef25377406f445d9453a (patch) | |
| tree | f00afc0f3f77760b8aaad9801c6ee01917c48f28 /include/svx | |
| parent | d1027af3c74529827d53e8cf7b0d42a0ee47d1ba (diff) | |
OperationSmiley: Secured quite some places using CustomShape
Changed quite some places of SdrObjCustomShape usage to use
references instead of pointers, thus forcing to more secure
handling. Changed some test and change methods, even found a
memory leak by doing so.
Change-Id: Iba76037a3c54af50bb05e6bd63d7ad04624665a7
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/EnhancedCustomShape2d.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx index 074ecfa0a124..8eb5021b3bad 100644 --- a/include/svx/EnhancedCustomShape2d.hxx +++ b/include/svx/EnhancedCustomShape2d.hxx @@ -72,7 +72,7 @@ namespace o3tl class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet { - SdrObject* pCustomShapeObj; + SdrObjCustomShape& mrSdrObjCustomShape; MSO_SPT eSpType; sal_Int32 nCoordLeft; @@ -189,7 +189,7 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet bool GetHandlePosition( const sal_uInt32 nIndex, Point& rReturnPosition ) const; bool SetHandleControllerPosition( const sal_uInt32 nIndex, const css::awt::Point& rPosition ); - EnhancedCustomShape2d( SdrObject* pSdrObjCustomShape ); + EnhancedCustomShape2d(SdrObjCustomShape& rSdrObjCustomShape); virtual ~EnhancedCustomShape2d() override; SAL_DLLPRIVATE double GetEnumFunc( const EnhancedCustomShape::ExpressionFunct eVal ) const; |