From dc836aa46d3436bf631a8f70a5e04d76ff7ad45f Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Fri, 27 Dec 2013 15:21:43 +0100 Subject: [PATCH] cppcheck: remove dups Change-Id: I59622a66358a688caac36b7da220588dc2da440a --- helpcontent2 | 2 +- sfx2/source/appl/sfxhelp.cxx | 1 - svx/source/sidebar/tools/ColorControl.cxx | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/helpcontent2 b/helpcontent2 index 74508d8b7731..0dc1069fa953 160000 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 74508d8b773142bf68780b8550ff70baaa53be89 +Subproject commit 0dc1069fa953547ac90aebf058b6ff18a83e820f diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 3640b4616a8c..7cf1b210a66e 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -339,7 +339,6 @@ OUString SfxHelp::GetHelpModuleName_Impl() || aFactoryShortName.startsWith("dbapp") || aFactoryShortName.startsWith("dbreport") || aFactoryShortName.startsWith("swreport") - || aFactoryShortName.startsWith("dbbrowser") || aFactoryShortName.startsWith("swform") ) aFactoryShortName = "sdatabase"; else if ( aFactoryShortName.startsWith("sbibliography") diff --git a/svx/source/sidebar/tools/ColorControl.cxx b/svx/source/sidebar/tools/ColorControl.cxx index 75264f1a108f..0ca0f3c5915a 100644 --- a/svx/source/sidebar/tools/ColorControl.cxx +++ b/svx/source/sidebar/tools/ColorControl.cxx @@ -123,7 +123,7 @@ void ColorControl::FillColors (void) return; const WinBits aWinBits(maVSColor.GetStyle() | WB_TABSTOP | WB_ITEMBORDER | WB_NAMEFIELD | - WB_NO_DIRECTSELECT | WB_MENUSTYLEVALUESET | WB_NO_DIRECTSELECT); + WB_NO_DIRECTSELECT | WB_MENUSTYLEVALUESET); maVSColor.SetStyle(aWinBits);