[Libreoffice-commits] core.git: connectivity/source desktop/source vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Dec 13 06:30:06 UTC 2018
connectivity/source/drivers/calc/CTable.cxx | 2 --
connectivity/source/drivers/mork/MResultSet.cxx | 3 ---
connectivity/source/drivers/mork/MResultSet.hxx | 1 -
connectivity/source/drivers/writer/WTable.cxx | 3 ---
connectivity/source/inc/calc/CTable.hxx | 2 --
connectivity/source/inc/writer/WTable.hxx | 4 ----
desktop/source/app/dispatchwatcher.cxx | 1 -
desktop/source/app/dispatchwatcher.hxx | 2 --
desktop/source/migration/migration.cxx | 6 ------
desktop/source/migration/migration_impl.hxx | 1 -
vcl/source/window/menu.cxx | 2 --
11 files changed, 27 deletions(-)
New commits:
commit e98bcfcc3cdad46620e3d59119b0ac262db88054
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Dec 12 13:18:03 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Dec 13 07:29:37 2018 +0100
loplugin:unusedfields in various
Change-Id: I4021ba6090bd3f42b0eb5ea1ec9bbf05d1594b35
Reviewed-on: https://gerrit.libreoffice.org/65054
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 9aea3b9fa549..72997c72c615 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -499,8 +499,6 @@ void OCalcTable::fillColumns()
Reference< XPropertySet> xCol = pColumn;
m_aColumns->get().push_back(xCol);
m_aTypes.push_back(eType);
- m_aPrecisions.push_back(nPrecision);
- m_aScales.push_back(nDecimals);
}
}
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index d8b7de04a0c1..c88785246cee 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -947,14 +947,11 @@ void OResultSet::fillRowData()
OSQLColumns::Vector::const_iterator aIter = m_xColumns->get().begin();
const OUString sPropertyName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME);
OUString sName;
- m_aAttributeStrings.clear();
- m_aAttributeStrings.reserve(m_xColumns->get().size());
for (sal_Int32 i = 1; aIter != m_xColumns->get().end();++aIter, i++)
{
(*aIter)->getPropertyValue(sPropertyName) >>= sName;
SAL_INFO(
"connectivity.mork", "Query Columns : (" << i << ") " << sName);
- m_aAttributeStrings.push_back( sName );
}
// Generate Match Conditions for Query
diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx
index 7f89d5f06623..dd329c3af25e 100644
--- a/connectivity/source/drivers/mork/MResultSet.hxx
+++ b/connectivity/source/drivers/mork/MResultSet.hxx
@@ -224,7 +224,6 @@ protected:
css::uno::Sequence< OUString> m_aColumnNames;
OValueRow m_aRow;
OValueRow m_aParameterRow;
- std::vector< OUString> m_aAttributeStrings;
sal_Int32 m_nParamIndex;
bool m_bIsAlwaysFalseQuery;
::rtl::Reference<OKeySet> m_pKeySet;
diff --git a/connectivity/source/drivers/writer/WTable.cxx b/connectivity/source/drivers/writer/WTable.cxx
index 91842be9e88d..1e847dfb9eb2 100644
--- a/connectivity/source/drivers/writer/WTable.cxx
+++ b/connectivity/source/drivers/writer/WTable.cxx
@@ -175,9 +175,6 @@ void OWriterTable::fillColumns()
m_CatalogName, getSchema(), getName());
uno::Reference<XPropertySet> xCol = pColumn;
m_aColumns->get().push_back(xCol);
- m_aTypes.push_back(eType);
- m_aPrecisions.push_back(nPrecision);
- m_aScales.push_back(nDecimals);
}
}
diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx
index 1d9b6897813b..00e91ee7f095 100644
--- a/connectivity/source/inc/calc/CTable.hxx
+++ b/connectivity/source/inc/calc/CTable.hxx
@@ -43,8 +43,6 @@ namespace connectivity
{
private:
std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset
- std::vector<sal_Int32> m_aPrecisions; // same as aboth
- std::vector<sal_Int32> m_aScales;
css::uno::Reference< css::sheet::XSpreadsheet > m_xSheet;
OCalcConnection* m_pCalcConnection;
sal_Int32 m_nStartCol;
diff --git a/connectivity/source/inc/writer/WTable.hxx b/connectivity/source/inc/writer/WTable.hxx
index d8cef045f581..27c77f2dbf7a 100644
--- a/connectivity/source/inc/writer/WTable.hxx
+++ b/connectivity/source/inc/writer/WTable.hxx
@@ -60,10 +60,6 @@ class OWriterConnection;
class OWriterTable : public OWriterTable_BASE
{
private:
- std::vector<sal_Int32>
- m_aTypes; // holds all type for columns just to avoid to ask the propertyset
- std::vector<sal_Int32> m_aPrecisions; // same as aboth
- std::vector<sal_Int32> m_aScales;
css::uno::Reference<css::text::XTextTable> m_xTable;
OWriterConnection* m_pWriterConnection;
sal_Int32 m_nStartCol;
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 3ae3c7d57269..bc363d03ae5b 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -430,7 +430,6 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest
{
::osl::ClearableMutexGuard aGuard(m_mutex);
// Remember request so we can find it in statusChanged!
- m_aRequestContainer.emplace(aURL.Complete, 1);
m_nRequestCount++;
}
diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx
index 24fd8c37e160..2b683ffd08fb 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -81,8 +81,6 @@ class DispatchWatcher : public ::cppu::WeakImplHelper< css::frame::XDispatchResu
private:
osl::Mutex m_mutex;
- std::unordered_map<OUString, sal_Int32> m_aRequestContainer;
-
sal_Int16 m_nRequestCount;
};
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 4bec38e38bda..bea253cb5c96 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -420,12 +420,6 @@ migrations_vr MigrationImpl::readMigrationSteps(const OUString& rMigrationName)
tmpStep.excludeConfig.push_back(rSeqEntry);
}
- // included extensions...
- if (tmpAccess->getByName("IncludedExtensions") >>= tmpSeq) {
- for (const OUString& rSeqEntry : tmpSeq)
- tmpStep.includeExtensions.push_back(rSeqEntry);
- }
-
// excluded extensions...
if (tmpAccess->getByName("ExcludedExtensions") >>= tmpSeq) {
for (const OUString& rSeqEntry : tmpSeq)
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index b8d0acb872dd..ba9a4b198de1 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -60,7 +60,6 @@ struct migration_step
strings_v excludeFiles;
strings_v includeConfig;
strings_v excludeConfig;
- strings_v includeExtensions;
strings_v excludeExtensions;
OUString service;
};
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 549595049b5f..bc310e55cd37 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -77,7 +77,6 @@ namespace vcl
struct MenuLayoutData : public ControlLayoutData
{
std::vector< sal_uInt16 > m_aLineItemIds;
- std::vector< sal_uInt16 > m_aLineItemPositions;
std::map< sal_uInt16, tools::Rectangle > m_aVisibleItemBoundRects;
};
@@ -1951,7 +1950,6 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext, Size const & rSize,
{
mpLayoutData->m_aLineIndices.push_back(mpLayoutData->m_aDisplayText.getLength());
mpLayoutData->m_aLineItemIds.push_back(pData->nId);
- mpLayoutData->m_aLineItemPositions.push_back(n);
}
// #i47946# with NWF painted menus the background is transparent
// since DrawCtrlText can depend on the background (e.g. for
More information about the Libreoffice-commits
mailing list