diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-09 15:39:25 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-09 15:42:23 +0100 |
commit | 8a50042889c138a6efbb395f3cb748beaac22189 (patch) | |
tree | 6d308605baaadb0099937be24fde7de7d8d3fbfd /sd/source/filter/eppt/epptbase.hxx | |
parent | 05fb5e871e1f7bc0938855b7e88886d105ec2932 (diff) |
Work around -fsanitize=null
...at least in CppunitTest_sd_export_tests, the dynamic_cast in
PPTWriterBase::GetStyleSheets (sd/source/filter/eppt/pptx-epptbase.cxx) can
fail, but the resulting reference appears to not be accessed then. So change
from reference to (potentially null) pointer.
Change-Id: Ide49be7bffefa7906e84349642f7c3d0666d414e
Diffstat (limited to 'sd/source/filter/eppt/epptbase.hxx')
-rw-r--r-- | sd/source/filter/eppt/epptbase.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx index 4b552a51ff38..c3554cdebd61 100644 --- a/sd/source/filter/eppt/epptbase.hxx +++ b/sd/source/filter/eppt/epptbase.hxx @@ -289,12 +289,12 @@ struct PPTExParaLevel struct PPTExParaSheet { - PPTExBulletProvider& rBuProv; + PPTExBulletProvider* pBuProv; sal_uInt32 mnInstance; PPTExParaLevel maParaLevel[ 5 ]; - PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBulletProvider& rProv ); + PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBulletProvider* pProv ); void SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, FontCollection& rFontCollection, int nLevel, const PPTExCharLevel& rCharLevel ); @@ -310,7 +310,7 @@ class PPTExStyleSheet PPTExCharSheet* mpCharSheet[ PPTEX_STYLESHEETENTRYS ]; PPTExParaSheet* mpParaSheet[ PPTEX_STYLESHEETENTRYS ]; - PPTExStyleSheet( sal_uInt16 nDefaultTab, PPTExBulletProvider& rBuProv ); + PPTExStyleSheet( sal_uInt16 nDefaultTab, PPTExBulletProvider* pBuProv ); ~PPTExStyleSheet(); PPTExParaSheet& GetParaSheet( int nInstance ) { return *mpParaSheet[ nInstance ]; }; |