forms/source/richtext/richtextcontrol.cxx | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
New commits: commit 322eaf80a777117548d05bf350c3b569877a033b Author: Jochen Nitschke <[email protected]> Date: Mon Apr 18 09:05:46 2016 +0000 cppcheck: silence known condition warning in forms Change-Id: I191dc169eea01d49ee357716a6bcc249e91437ec Reviewed-on: https://gerrit.libreoffice.org/24201 Tested-by: Jenkins <[email protected]> Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index c535f5a..471df8e 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -508,13 +508,9 @@ namespace frm default: { - // is it a supported slot? - bool bSupportedSlot = false; - if ( !bSupportedSlot ) - { - const SfxItemPool& rPool = *pRichTextControl->getView().GetEmptyItemSet().GetPool(); - bSupportedSlot = rPool.IsInRange( rPool.GetWhich( _nSlotId ) ); - } + const SfxItemPool& rPool = *pRichTextControl->getView().GetEmptyItemSet().GetPool(); + bool bSupportedSlot = rPool.IsInRange( rPool.GetWhich( _nSlotId ) ); + if ( !bSupportedSlot ) bSupportedSlot = RichTextControl::isMappableSlot( _nSlotId ); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
