include/vcl/svapp.hxx | 2 +- svx/source/engine3d/float3d.cxx | 2 +- tools/source/generic/poly.cxx | 2 +- vcl/source/app/svapp.cxx | 8 +++----- 4 files changed, 6 insertions(+), 8 deletions(-)
New commits: commit 2d2bb23a3bd860c4baa2dcfe4d1bbe1dea64b9a2 Author: Noel Grandin <n...@peralex.com> Date: Mon Oct 27 13:21:00 2014 +0200 cid#735507 Logically dead code Change-Id: Ie251bca3e4fa7c67aa84c8ff3ae451b0aaa57f44 diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 6030a40..742f1f0 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -2111,7 +2111,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Textures // Art - nValue = 3; + nValue = 99; if( aBtnTexLuminance.IsChecked() ) nValue = 1; else if( aBtnTexColor.IsChecked() ) commit 627a9982f25b22520537592e9c7a566e0d9c950a Author: Noel Grandin <n...@peralex.com> Date: Mon Oct 27 12:30:28 2014 +0200 cid#705053 Dereference after null check re-arrange the code to help coverity out Change-Id: Iddc9284cbdcbaae7a0dc17e62d0e8f4b4832297c diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 68dd3c7..7f9dc50 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -1546,7 +1546,7 @@ public: private: - static void InitSettings(); + static void InitSettings(ImplSVData* pSVData); DECL_STATIC_LINK( Application, PostEventHandler, void* ); }; diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index fd0077e..0355ec0 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -517,7 +517,7 @@ void Application::SetSettings( const AllSettings& rSettings ) ImplSVData* pSVData = ImplGetSVData(); if ( !pSVData->maAppData.mpSettings ) { - InitSettings(); + InitSettings(pSVData); *pSVData->maAppData.mpSettings = rSettings; ResMgr::SetDefaultLocale( rSettings.GetUILanguageTag() ); } @@ -616,16 +616,14 @@ const AllSettings& Application::GetSettings() ImplSVData* pSVData = ImplGetSVData(); if ( !pSVData->maAppData.mpSettings ) { - InitSettings(); + InitSettings(pSVData); } return *(pSVData->maAppData.mpSettings); } -void Application::InitSettings() +void Application::InitSettings(ImplSVData* pSVData) { - ImplSVData* pSVData = ImplGetSVData(); - assert(!pSVData->maAppData.mpSettings && "initialization should not happen twice!"); pSVData->maAppData.mpCfgListener = new LocaleConfigurationListener; commit 91fac2a32c1c6b784bd33cf664ea64a734b1c776 Author: Noel Grandin <n...@peralex.com> Date: Mon Oct 27 11:59:36 2014 +0200 cid#705051 Dereference after null check Change-Id: I6b7adb593efa137bb09b3b8d49539f6cd405dd20 diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx index a588719..56b224b 100644 --- a/tools/source/generic/poly.cxx +++ b/tools/source/generic/poly.cxx @@ -606,7 +606,7 @@ void Polygon::SetFlags( sal_uInt16 nPos, PolyFlags eFlags ) // we do only want to create the flag array if there // is at least one flag different to POLY_NORMAL - if ( mpImplPolygon || ( eFlags != POLY_NORMAL ) ) + if ( eFlags != POLY_NORMAL ) { ImplMakeUnique(); mpImplPolygon->ImplCreateFlagArray(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits