extensions/source/propctrlr/cellbindinghelper.cxx | 3 +--
helpcontent2 | 2 +-
sfx2/source/appl/sfxhelp.cxx | 1 -
sot/source/sdstor/storage.cxx | 3 +--
svx/source/sidebar/tools/ColorControl.cxx | 2 +-
5 files changed, 4 insertions(+), 7 deletions(-)
New commits:
commit dc836aa46d3436bf631a8f70a5e04d76ff7ad45f
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Fri Dec 27 15:21:43 2013 +0100
cppcheck: remove dups
Change-Id: I59622a66358a688caac36b7da220588dc2da440a
diff --git a/helpcontent2 b/helpcontent2
index 74508d8..0dc1069 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 3640b46..7cf1b21 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 75264f1..0ca0f3c 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);
commit f23ae024461665eac0bdcc569eabe9caf28a8943
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Fri Dec 27 15:07:53 2013 +0100
cppcheck: reduce scope
Change-Id: I14956a86b8c83b9432c1eda511371beb026fd680
diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx
b/extensions/source/propctrlr/cellbindinghelper.cxx
index 7182239..8339951 100644
--- a/extensions/source/propctrlr/cellbindinghelper.cxx
+++ b/extensions/source/propctrlr/cellbindinghelper.cxx
@@ -506,9 +506,8 @@ namespace pcr
//------------------------------------------------------------------------
bool CellBindingHelper::doesComponentSupport( const Reference< XInterface
>& _rxComponent, const OUString& _rService ) const
{
- bool bDoes = false;
Reference< XServiceInfo > xSI( _rxComponent, UNO_QUERY );
- bDoes = xSI.is() && xSI->supportsService( _rService );
+ bool bDoes = xSI.is() && xSI->supportsService( _rService );
return bDoes;
}
commit a81896a9d2517155f1d8ec7a98767bfc27c1f0c7
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Fri Dec 27 15:05:23 2013 +0100
cppcheck: reduce scope
Change-Id: If8220e82165d8ab85906584baa3827e3b6f5c2f4
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 3ae0236..9b408647c 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -775,7 +775,6 @@ SotStorage * SotStorage::OpenSotStorage( const OUString &
rEleName,
StreamMode nMode,
StorageMode nStorageMode )
{
- SotStorage * pStor = NULL;
DBG_ASSERT( Owner(), "must be owner" );
if( m_pOwnStg )
{
@@ -785,7 +784,7 @@ SotStorage * SotStorage::OpenSotStorage( const OUString &
rEleName,
(nStorageMode & STORAGE_TRANSACTED) ? false : true );
if( p )
{
- pStor = new SotStorage( p );
+ SotStorage * pStor = new SotStorage( p );
if( !nE )
m_pOwnStg->ResetError(); // kein Fehler setzen
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
