summaryrefslogtreecommitdiff
path: root/sc/source/ui/vba
diff options
context:
space:
mode:
authorArkadiy Illarionov <qarkai@gmail.com>2019-08-10 22:20:30 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2019-08-12 15:23:53 +0200
commit4721cbb1bb118d33ac9fcf93dda8c083b364003d (patch)
treef958d6b46d40fd573483139512b4c31dbd6e153b /sc/source/ui/vba
parenta684613daf9ed5670c5f80267cc1bea0b878b1f6 (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/vba')
-rw-r--r--sc/source/ui/vba/vbachartobjects.cxx6
-rw-r--r--sc/source/ui/vba/vbapagebreaks.cxx4
-rw-r--r--sc/source/ui/vba/vbapagesetup.cxx2
-rw-r--r--sc/source/ui/vba/vbarange.cxx6
-rw-r--r--sc/source/ui/vba/vbasheetobject.cxx2
5 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx
index 148fe7b94bce..f817dd8fbb90 100644
--- a/sc/source/ui/vba/vbachartobjects.cxx
+++ b/sc/source/ui/vba/vbachartobjects.cxx
@@ -107,11 +107,11 @@ ScVbaChartObjects::getChartObjectNames()
uno::Reference< sheet::XSpreadsheets > xSpreadsheets = xSpreadsheetDocument->getSheets();
std::vector< OUString > aChartNamesVector;
- uno::Sequence< OUString > sSheetNames = xSpreadsheets->getElementNames();
+ const uno::Sequence< OUString > sSheetNames = xSpreadsheets->getElementNames();
for (const auto& rSheetName : sSheetNames)
{
uno::Reference< table::XTableChartsSupplier > xLocTableChartsSupplier( xSpreadsheets->getByName(rSheetName), uno::UNO_QUERY_THROW );
- uno::Sequence< OUString > scurchartnames = xLocTableChartsSupplier->getCharts()->getElementNames();
+ const uno::Sequence< OUString > scurchartnames = xLocTableChartsSupplier->getCharts()->getElementNames();
std::copy(scurchartnames.begin(), scurchartnames.end(), std::back_inserter(aChartNamesVector));
}
sChartNames = comphelper::containerToSequence( aChartNamesVector );
@@ -150,7 +150,7 @@ ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight
}
void SAL_CALL ScVbaChartObjects::Delete( )
{
- uno::Sequence< OUString > sChartNames = xTableCharts->getElementNames();
+ const uno::Sequence< OUString > sChartNames = xTableCharts->getElementNames();
for (const auto& rChartName : sChartNames)
removeByName(rChartName);
}
diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx
index 5372c32a5079..89c871edd3a8 100644
--- a/sc/source/ui/vba/vbapagebreaks.cxx
+++ b/sc/source/ui/vba/vbapagebreaks.cxx
@@ -113,7 +113,7 @@ sal_Int32 SAL_CALL RangePageBreaks::getCount( )
uno::Reference< excel::XRange > xRange = xWorksheet->getUsedRange();
sal_Int32 nUsedStart = getAPIStartofRange( xRange );
sal_Int32 nUsedEnd = getAPIEndIndexofRange( xRange, nUsedStart );
- uno::Sequence<sheet::TablePageBreakData> aTablePageBreakData = getAllPageBreaks();
+ const uno::Sequence<sheet::TablePageBreakData> aTablePageBreakData = getAllPageBreaks();
auto pPageBreak = std::find_if(aTablePageBreakData.begin(), aTablePageBreakData.end(),
[nUsedEnd](const sheet::TablePageBreakData& rPageBreak) { return rPageBreak.Position > nUsedEnd + 1; });
@@ -147,7 +147,7 @@ sheet::TablePageBreakData RangePageBreaks::getTablePageBreakData( sal_Int32 nAPI
uno::Reference< excel::XRange > xRange = xWorksheet->getUsedRange();
sal_Int32 nUsedStart = getAPIStartofRange( xRange );
sal_Int32 nUsedEnd = getAPIEndIndexofRange( xRange, nUsedStart );
- uno::Sequence<sheet::TablePageBreakData> aTablePageBreakDataList = getAllPageBreaks();
+ const uno::Sequence<sheet::TablePageBreakData> aTablePageBreakDataList = getAllPageBreaks();
for( const auto& rTablePageBreakData : aTablePageBreakDataList )
{
diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx
index f7a4ac9e6585..f06dbbe701b9 100644
--- a/sc/source/ui/vba/vbapagesetup.cxx
+++ b/sc/source/ui/vba/vbapagesetup.cxx
@@ -66,7 +66,7 @@ OUString SAL_CALL ScVbaPageSetup::getPrintArea()
{
OUString aPrintArea;
uno::Reference< sheet::XPrintAreas > xPrintAreas( mxSheet, uno::UNO_QUERY_THROW );
- uno::Sequence< table::CellRangeAddress > aSeq = xPrintAreas->getPrintAreas();
+ const uno::Sequence< table::CellRangeAddress > aSeq = xPrintAreas->getPrintAreas();
if( aSeq.hasElements() )
{
ScAddress::Details aDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 );
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 4776e6750048..ae253133be66 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -204,7 +204,7 @@ static uno::Any lcl_makeRange( const uno::Reference< XHelperInterface >& rParent
static uno::Reference< excel::XRange > lcl_makeXRangeFromSheetCellRanges( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSheetCellRanges >& xLocSheetCellRanges, ScDocShell* pDoc )
{
uno::Reference< excel::XRange > xRange;
- uno::Sequence< table::CellRangeAddress > sAddresses = xLocSheetCellRanges->getRangeAddresses();
+ const uno::Sequence< table::CellRangeAddress > sAddresses = xLocSheetCellRanges->getRangeAddresses();
ScRangeList aCellRanges;
if ( sAddresses.hasElements() )
{
@@ -2286,7 +2286,7 @@ ScVbaRange::Activate()
if ( xRanges.is() )
{
- uno::Sequence< table::CellRangeAddress > nAddrs = xRanges->getRangeAddresses();
+ const uno::Sequence< table::CellRangeAddress > nAddrs = xRanges->getRangeAddresses();
for ( const auto& rAddr : nAddrs )
{
if ( cellInRange( rAddr, thisRangeAddress.StartColumn, thisRangeAddress.StartRow ) )
@@ -4076,7 +4076,7 @@ static uno::Reference< sheet::XCellRangeReferrer > getNamedRange( const uno::Ref
uno::Reference< beans::XPropertySet > xProps( xIf, uno::UNO_QUERY_THROW );
uno::Reference< container::XNameAccess > xNameAccess( xProps->getPropertyValue( "NamedRanges" ), uno::UNO_QUERY_THROW );
- uno::Sequence< OUString > sNames = xNameAccess->getElementNames();
+ const uno::Sequence< OUString > sNames = xNameAccess->getElementNames();
// uno::Reference< table::XCellRange > thisRange( getCellRange(), uno::UNO_QUERY_THROW );
uno::Reference< sheet::XCellRangeReferrer > xNamedRange;
for ( const auto& rName : sNames )
diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx
index bf88b991f05d..2df219af7874 100644
--- a/sc/source/ui/vba/vbasheetobject.cxx
+++ b/sc/source/ui/vba/vbasheetobject.cxx
@@ -318,7 +318,7 @@ OUString SAL_CALL ScVbaControlObjectBase::getOnAction()
{
uno::Reference< script::XEventAttacherManager > xEventMgr( mxFormIC, uno::UNO_QUERY_THROW );
sal_Int32 nIndex = getModelIndexInForm();
- uno::Sequence< script::ScriptEventDescriptor > aEvents = xEventMgr->getScriptEvents( nIndex );
+ const uno::Sequence< script::ScriptEventDescriptor > aEvents = xEventMgr->getScriptEvents( nIndex );
if( aEvents.hasElements() )
{
const OUString aScriptType = "Script";