diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-04 14:34:07 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-11 09:48:10 +0200 |
commit | 49eb02f07a5af44da59008a238e828b4a9532bef (patch) | |
tree | 43c4b4eaacd79fe0bff784a4ef71f4c1080c3912 /dbaccess | |
parent | 5823ecd54b16974ffe8821a5ae061cd0ecc4cf84 (diff) |
new loplugin:unusedvariablemore
collection of heuristics to look for local variables that are never read
from i.e. do not contribute to the surrounding logic
This is an expensive plugin, since it walks up the parent tree,
so it is off by default.
Change-Id: Ib8ba292241bd16adf299e8bba4502cb473513a06
Reviewed-on: https://gerrit.libreoffice.org/52450
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/filter/xml/xmlDataSourceInfo.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/control/tabletree.cxx | 23 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/generalpage.cxx | 16 |
3 files changed, 2 insertions, 39 deletions
diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx index f1ae31aba077..5cf4ee184ed5 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx @@ -50,7 +50,6 @@ OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; bool bAutoEnabled = false; bool bFoundField = false,bFoundThousand = false, bFoundCharset = false; - std::vector< sal_uInt16 > aTokens; for(sal_Int16 i = 0; i < nLength; ++i) { OUString sLocalName; @@ -61,7 +60,6 @@ OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport aProperty.Name.clear(); sal_uInt16 nToken = rTokenMap.Get( nPrefix, sLocalName ); - aTokens.push_back(nToken); switch( nToken ) { case XML_TOK_ADDITIONAL_COLUMN_STATEMENT: diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 15a86f47f131..31428879bf09 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -468,28 +468,7 @@ NamedDatabaseObject OTableTreeListBox::describeObject( SvTreeListEntry* _pEntry || ( nEntryType == DatabaseObjectContainer::SCHEMA ) ) { - SvTreeListEntry* pParent = GetParent( _pEntry ); - sal_Int32 nParentEntryType = pParent ? reinterpret_cast< sal_IntPtr >( pParent->GetUserData() ) : -1; - - OUStringBuffer buffer; - if ( nEntryType == DatabaseObjectContainer::CATALOG ) - { - if ( nParentEntryType == DatabaseObjectContainer::SCHEMA ) - { - buffer.append( GetEntryText( pParent ) ); - buffer.append( '.' ); - } - buffer.append( GetEntryText( _pEntry ) ); - } - else if ( nEntryType == DatabaseObjectContainer::SCHEMA ) - { - if ( nParentEntryType == DatabaseObjectContainer::CATALOG ) - { - buffer.append( GetEntryText( pParent ) ); - buffer.append( '.' ); - } - buffer.append( GetEntryText( _pEntry ) ); - } + // nothing useful to be done } else { diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index d62403e56da8..6dbfbe6d1285 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -238,17 +238,6 @@ namespace dbaui getFlags( _rSet, bValid, bReadonly ); // if the selection is invalid, disable everything - OUString sName,sConnectURL; - if ( bValid ) - { - // collect some items and some values - const SfxStringItem* pNameItem = _rSet.GetItem<SfxStringItem>(DSID_NAME); - const SfxStringItem* pUrlItem = _rSet.GetItem<SfxStringItem>(DSID_CONNECTURL); - assert( pUrlItem ); - assert( pNameItem ); - sName = pNameItem->GetValue(); - sConnectURL = pUrlItem->GetValue(); - } implSetCurrentType( OUString() ); @@ -281,15 +270,12 @@ namespace dbaui getFlags( _rSet, bValid, bReadonly ); // if the selection is invalid, disable everything - OUString sName,sConnectURL; + OUString sConnectURL; if ( bValid ) { // collect some items and some values - const SfxStringItem* pNameItem = _rSet.GetItem<SfxStringItem>(DSID_NAME); const SfxStringItem* pUrlItem = _rSet.GetItem<SfxStringItem>(DSID_CONNECTURL); assert( pUrlItem ); - assert( pNameItem ); - sName = pNameItem->GetValue(); sConnectURL = pUrlItem->GetValue(); } |