summaryrefslogtreecommitdiff
path: root/sc/source/ui/unoobj
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/unoobj')
-rw-r--r--sc/source/ui/unoobj/PivotTableDataProvider.cxx12
-rw-r--r--sc/source/ui/unoobj/PivotTableDataSequence.cxx2
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx4
-rw-r--r--sc/source/ui/unoobj/chart2uno.cxx34
-rw-r--r--sc/source/ui/unoobj/dapiuno.cxx2
-rw-r--r--sc/source/ui/unoobj/datauno.cxx2
-rw-r--r--sc/source/ui/unoobj/dispuno.cxx2
-rw-r--r--sc/source/ui/unoobj/fmtuno.cxx2
-rw-r--r--sc/source/ui/unoobj/listenercalls.cxx2
-rw-r--r--sc/source/ui/unoobj/unoreflist.cxx2
10 files changed, 29 insertions, 35 deletions
diff --git a/sc/source/ui/unoobj/PivotTableDataProvider.cxx b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
index 971a46a8938c..7d5a3bfa90c7 100644
--- a/sc/source/ui/unoobj/PivotTableDataProvider.cxx
+++ b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
@@ -315,7 +315,7 @@ void PivotTableDataProvider::collectPivotTableData()
continue;
if (rDataResult.Flags == 0 || rDataResult.Flags & css::sheet::DataResultFlags::HASDATA)
{
- aRow.push_back(ValueAndFormat(rDataResult.Flags ? rDataResult.Value : fNan, 0));
+ aRow.emplace_back(rDataResult.Flags ? rDataResult.Value : fNan, 0);
if (rDataResult.Flags != 0) // set as valid only if we have data
{
bRowEmpty = false;
@@ -396,7 +396,7 @@ void PivotTableDataProvider::collectPivotTableData()
{
case sheet::DataPilotFieldOrientation_COLUMN:
{
- m_aColumnFields.push_back(chart2::data::PivotTableFieldEntry{xLevelName->getName(), nDim, nDimPos, bHasHiddenMember});
+ m_aColumnFields.emplace_back(xLevelName->getName(), nDim, nDimPos, bHasHiddenMember);
uno::Sequence<sheet::MemberResult> aSequence = xLevelResult->getResults();
size_t i = 0;
@@ -440,7 +440,7 @@ void PivotTableDataProvider::collectPivotTableData()
case sheet::DataPilotFieldOrientation_ROW:
{
- m_aRowFields.push_back(chart2::data::PivotTableFieldEntry{xLevelName->getName(), nDim, nDimPos, bHasHiddenMember});
+ m_aRowFields.emplace_back(xLevelName->getName(), nDim, nDimPos, bHasHiddenMember);
uno::Sequence<sheet::MemberResult> aSequence = xLevelResult->getResults();
@@ -498,7 +498,7 @@ void PivotTableDataProvider::collectPivotTableData()
case sheet::DataPilotFieldOrientation_PAGE:
{
- m_aPageFields.push_back(chart2::data::PivotTableFieldEntry{xLevelName->getName(), nDim, nDimPos, bHasHiddenMember});
+ m_aPageFields.emplace_back(xLevelName->getName(), nDim, nDimPos, bHasHiddenMember);
// Resolve filtering
OUString aFieldOutputDescription;
@@ -522,7 +522,7 @@ void PivotTableDataProvider::collectPivotTableData()
case sheet::DataPilotFieldOrientation_DATA:
{
aDataFieldNumberFormatMap[xLevelName->getName()] = nNumberFormat;
- m_aDataFields.push_back(chart2::data::PivotTableFieldEntry{xLevelName->getName(), nDim, nDimPos, bHasHiddenMember});
+ m_aDataFields.emplace_back(xLevelName->getName(), nDim, nDimPos, bHasHiddenMember);
}
break;
@@ -833,7 +833,7 @@ void SAL_CALL PivotTableDataProvider::addModifyListener(const uno::Reference< ut
{
SolarMutexGuard aGuard;
- m_aValueListeners.push_back(uno::Reference<util::XModifyListener>(aListener));
+ m_aValueListeners.emplace_back(aListener);
}
void SAL_CALL PivotTableDataProvider::removeModifyListener(const uno::Reference<util::XModifyListener>& aListener )
diff --git a/sc/source/ui/unoobj/PivotTableDataSequence.cxx b/sc/source/ui/unoobj/PivotTableDataSequence.cxx
index 23b7fd82817b..2db6dc468757 100644
--- a/sc/source/ui/unoobj/PivotTableDataSequence.cxx
+++ b/sc/source/ui/unoobj/PivotTableDataSequence.cxx
@@ -179,7 +179,7 @@ uno::Reference<util::XCloneable> SAL_CALL PivotTableDataSequence::createClone()
void SAL_CALL PivotTableDataSequence::addModifyListener(const uno::Reference<util::XModifyListener>& aListener)
{
SolarMutexGuard aGuard;
- m_aValueListeners.push_back(uno::Reference<util::XModifyListener>(aListener));
+ m_aValueListeners.emplace_back(aListener);
}
void SAL_CALL PivotTableDataSequence::removeModifyListener(const uno::Reference<util::XModifyListener>& aListener)
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index d51b82663b3d..1abd589b8297 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3376,7 +3376,7 @@ void SAL_CALL ScCellRangesBase::addModifyListener(const uno::Reference<util::XMo
if ( aRanges.empty() )
throw uno::RuntimeException();
- aValueListeners.push_back( uno::Reference<util::XModifyListener>( aListener ) );
+ aValueListeners.emplace_back( aListener );
if ( aValueListeners.size() == 1 )
{
@@ -4407,7 +4407,7 @@ void SAL_CALL ScCellRangesObj::insertByName( const OUString& aName, const uno::A
// if a name is given, also insert into list of named entries
// (only possible for a single range)
// name is not in m_pImpl->m_aNamedEntries (tested above)
- m_pImpl->m_aNamedEntries.push_back(ScNamedEntry( aName, *rAddRanges[ 0 ] ));
+ m_pImpl->m_aNamedEntries.emplace_back( aName, *rAddRanges[ 0 ] );
}
}
}
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 3cf1ec0a7861..dc0c2dfc498e 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1911,34 +1911,30 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
InsertTabNumber func;
func = ::std::for_each(aAllTokens.begin(), aAllTokens.end(), func);
func.getList(aTableNumList);
- aResult.push_back(
- beans::PropertyValue( "TableNumberList", -1,
+ aResult.emplace_back( "TableNumberList", -1,
uno::makeAny( lcl_createTableNumberList( aTableNumList ) ),
- beans::PropertyState_DIRECT_VALUE ));
+ beans::PropertyState_DIRECT_VALUE );
}
// DataRowSource (calculated before)
if( bRowSourceDetected )
{
- aResult.push_back(
- beans::PropertyValue( "DataRowSource", -1,
- uno::makeAny( eRowSource ), beans::PropertyState_DIRECT_VALUE ));
+ aResult.emplace_back( "DataRowSource", -1,
+ uno::makeAny( eRowSource ), beans::PropertyState_DIRECT_VALUE );
}
// HasCategories
if( bRowSourceDetected )
{
- aResult.push_back(
- beans::PropertyValue( "HasCategories", -1,
- uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE ));
+ aResult.emplace_back( "HasCategories", -1,
+ uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE );
}
// FirstCellAsLabel
if( bRowSourceDetected )
{
- aResult.push_back(
- beans::PropertyValue( "FirstCellAsLabel", -1,
- uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ));
+ aResult.emplace_back( "FirstCellAsLabel", -1,
+ uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE );
}
// Add the left upper corner to the range if it is missing.
@@ -1962,9 +1958,8 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
lcl_convertTokensToString(sRangeRep, aAllTokens, m_pDocument);
// add cell range property
- aResult.push_back(
- beans::PropertyValue( "CellRangeRepresentation", -1,
- uno::makeAny( sRangeRep ), beans::PropertyState_DIRECT_VALUE ));
+ aResult.emplace_back( "CellRangeRepresentation", -1,
+ uno::makeAny( sRangeRep ), beans::PropertyState_DIRECT_VALUE );
//Sequence Mapping
bool const bSequencesReordered = true;//todo detect this above or detect this sequence mapping cheaper ...
@@ -2023,10 +2018,9 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
if( bDifferentIndexes && !aSequenceMappingVector.empty() )
{
- aResult.push_back(
- beans::PropertyValue( "SequenceMapping", -1,
+ aResult.emplace_back( "SequenceMapping", -1,
uno::makeAny( comphelper::containerToSequence(aSequenceMappingVector) )
- , beans::PropertyState_DIRECT_VALUE ));
+ , beans::PropertyState_DIRECT_VALUE );
}
}
@@ -2680,7 +2674,7 @@ sal_Int32 ScChart2DataSequence::FillCacheFromExternalRef(const ScTokenRef& pToke
aItem.mbIsValue = false;
aItem.maString = pMat->GetString(nC, nR).getString();
- m_aDataArray.push_back(Item());
+ m_aDataArray.emplace_back();
++nDataCount;
}
}
@@ -3246,7 +3240,7 @@ void SAL_CALL ScChart2DataSequence::addModifyListener( const uno::Reference< uti
ScRangeList aRanges;
ScRefTokenHelper::getRangeListFromTokens(aRanges, m_aTokens, ScAddress());
- m_aValueListeners.push_back( uno::Reference<util::XModifyListener>( aListener ) );
+ m_aValueListeners.emplace_back( aListener );
if ( m_aValueListeners.size() == 1 )
{
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index d2a7f81d986d..d6eb02a1eb4d 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1267,7 +1267,7 @@ void SAL_CALL ScDataPilotTableObj::addModifyListener( const uno::Reference<util:
{
SolarMutexGuard aGuard;
- aModifyListeners.push_back( uno::Reference<util::XModifyListener>( aListener ) );
+ aModifyListeners.emplace_back( aListener );
if ( aModifyListeners.size() == 1 )
{
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index c2a280967ae3..d3b765a8b78e 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -1872,7 +1872,7 @@ void SAL_CALL ScDatabaseRangeObj::addRefreshListener(
const uno::Reference<util::XRefreshListener >& xListener )
{
SolarMutexGuard aGuard;
- aRefreshListeners.push_back( uno::Reference<util::XRefreshListener>( xListener ));
+ aRefreshListeners.emplace_back( xListener );
// hold one additional ref to keep this object alive as long as there are listeners
if ( aRefreshListeners.size() == 1 )
diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx
index eafdb2293872..517d543cb9e6 100644
--- a/sc/source/ui/unoobj/dispuno.cxx
+++ b/sc/source/ui/unoobj/dispuno.cxx
@@ -270,7 +270,7 @@ void SAL_CALL ScDispatch::addStatusListener(
if ( aURL.Complete == cURLDocDataSource )
{
- aDataSourceListeners.push_back( uno::Reference<frame::XStatusListener>( xListener ) );
+ aDataSourceListeners.emplace_back( xListener );
if (!bListeningToView)
{
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 58d88da8aa7c..1187454cab57 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -234,7 +234,7 @@ ScTableConditionalFormat::~ScTableConditionalFormat()
void ScTableConditionalFormat::AddEntry_Impl(const ScCondFormatEntryItem& aEntry)
{
ScTableConditionalEntry* pNew = new ScTableConditionalEntry(aEntry);
- maEntries.push_back(pNew);
+ maEntries.emplace_back(pNew);
}
// XSheetConditionalFormat
diff --git a/sc/source/ui/unoobj/listenercalls.cxx b/sc/source/ui/unoobj/listenercalls.cxx
index 1164043b3977..1f7042735de3 100644
--- a/sc/source/ui/unoobj/listenercalls.cxx
+++ b/sc/source/ui/unoobj/listenercalls.cxx
@@ -37,7 +37,7 @@ void ScUnoListenerCalls::Add( const uno::Reference<util::XModifyListener>& rList
const lang::EventObject& rEvent )
{
if ( rListener.is() )
- aEntries.push_back( ScUnoListenerEntry( rListener, rEvent ) );
+ aEntries.emplace_back( rListener, rEvent );
}
void ScUnoListenerCalls::ExecuteAndClear()
diff --git a/sc/source/ui/unoobj/unoreflist.cxx b/sc/source/ui/unoobj/unoreflist.cxx
index 13d6cd06a0d6..bc0cde0277e2 100644
--- a/sc/source/ui/unoobj/unoreflist.cxx
+++ b/sc/source/ui/unoobj/unoreflist.cxx
@@ -30,7 +30,7 @@ ScUnoRefList::~ScUnoRefList()
void ScUnoRefList::Add( sal_Int64 nId, const ScRangeList& rOldRanges )
{
- aEntries.push_back( ScUnoRefEntry( nId, rOldRanges ) );
+ aEntries.emplace_back( nId, rOldRanges );
}
void ScUnoRefList::Undo( ScDocument* pDoc )
generated by cgit (git 2.34.1) at 2024-07-15 19:19:52 +0000