diff options
| author | Arkadiy Illarionov <qarkai@gmail.com> | 2019-08-10 22:20:30 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-08-12 15:23:53 +0200 |
| commit | 4721cbb1bb118d33ac9fcf93dda8c083b364003d (patch) | |
| tree | f958d6b46d40fd573483139512b4c31dbd6e153b /sc/source/ui/dbgui | |
| parent | a684613daf9ed5670c5f80267cc1bea0b878b1f6 (diff) | |
Mark Sequence const in sc
It ensures that const begin()/end() methods will be called,
removing any overhead.
fca94779872b8ba0b0583d0b7068f1a46beb88c5 follow-up.
Change-Id: Id680744abb1b3887f25c9bfa033106de18a9c2d0
Reviewed-on: https://gerrit.libreoffice.org/77250
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sc/source/ui/dbgui')
| -rw-r--r-- | sc/source/ui/dbgui/dapidata.cxx | 18 | ||||
| -rw-r--r-- | sc/source/ui/dbgui/tpsort.cxx | 2 |
2 files changed, 8 insertions, 12 deletions
diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index 638d6a20b8f3..75e895f25a5f 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -54,7 +54,7 @@ ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg(weld::Window* pParent) uno::Reference<sdb::XDatabaseContext> xContext = sdb::DatabaseContext::create( comphelper::getProcessComponentContext() ); - uno::Sequence<OUString> aNames = xContext->getElementNames(); + const uno::Sequence<OUString> aNames = xContext->getElementNames(); for( const OUString& aName : aNames ) { m_xLbDatabase->append_text(aName); @@ -131,7 +131,7 @@ void ScDataPilotDatabaseDlg::FillObjects() uno::Reference<sdbc::XConnection> xConnection = xSource->connectWithCompletion( xHandler ); - uno::Sequence<OUString> aNames; + uno::Reference<container::XNameAccess> xItems; if ( nSelect == DP_TYPELIST_TABLE ) { // get all tables @@ -139,10 +139,7 @@ void ScDataPilotDatabaseDlg::FillObjects() uno::Reference<sdbcx::XTablesSupplier> xTablesSupp( xConnection, uno::UNO_QUERY ); if ( !xTablesSupp.is() ) return; - uno::Reference<container::XNameAccess> xTables = xTablesSupp->getTables(); - if ( !xTables.is() ) return; - - aNames = xTables->getElementNames(); + xItems = xTablesSupp->getTables(); } else { @@ -151,14 +148,13 @@ void ScDataPilotDatabaseDlg::FillObjects() uno::Reference<sdb::XQueriesSupplier> xQueriesSupp( xConnection, uno::UNO_QUERY ); if ( !xQueriesSupp.is() ) return; - uno::Reference<container::XNameAccess> xQueries = xQueriesSupp->getQueries(); - if ( !xQueries.is() ) return; - - aNames = xQueries->getElementNames(); + xItems = xQueriesSupp->getQueries(); } - // fill list + if ( !xItems.is() ) return; + // fill list + const uno::Sequence<OUString> aNames = xItems->getElementNames(); for( const OUString& aName : aNames ) { m_xCbObject->append_text(aName); diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index d4654e3b83f4..1df0446cf722 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -887,7 +887,7 @@ void ScTabPageSortOptions::FillAlgor() else { lang::Locale aLocale( LanguageTag::convertToLocale( eLang )); - uno::Sequence<OUString> aAlgos = m_xColWrap->listCollatorAlgorithms( aLocale ); + const uno::Sequence<OUString> aAlgos = m_xColWrap->listCollatorAlgorithms( aLocale ); long nCount = aAlgos.getLength(); for (const OUString& sAlg : aAlgos) |