Kaydet (Commit) a93b691b authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unusedvariable add some more std:: types

Change-Id: Ib15931e415990b56367fe3e1c7cf3f22cc4826d5
Reviewed-on: https://gerrit.libreoffice.org/44529Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 4887f9fe
......@@ -254,33 +254,26 @@ struct StaticDiagramInfo : public rtl::StaticAggregate< uno::Reference< beans::X
/// clones a UNO-sequence of UNO-References
typedef Reference< chart2::XCoordinateSystem > lcl_tCooSysRef;
typedef std::map< lcl_tCooSysRef, lcl_tCooSysRef > lcl_tCooSysMapping;
typedef std::vector< lcl_tCooSysRef > lcl_tCooSysVector;
typedef std::vector< lcl_tCooSysRef > lcl_tCooSysVector;
lcl_tCooSysMapping lcl_CloneCoordinateSystems(
void lcl_CloneCoordinateSystems(
const lcl_tCooSysVector & rSource,
lcl_tCooSysVector & rDestination )
{
lcl_tCooSysMapping aResult;
for( lcl_tCooSysVector::const_iterator aIt( rSource.begin());
aIt != rSource.end(); ++aIt )
for( auto const & i : rSource )
{
lcl_tCooSysRef xClone;
css::uno::Reference< css::util::XCloneable > xCloneable( *aIt, css::uno::UNO_QUERY );
css::uno::Reference< css::util::XCloneable > xCloneable( i, css::uno::UNO_QUERY );
if( xCloneable.is())
xClone.set( xCloneable->createClone(), css::uno::UNO_QUERY );
if( xClone.is())
{
rDestination.push_back( xClone );
aResult.emplace( *aIt, xClone );
}
else
rDestination.push_back( *aIt );
rDestination.push_back( i );
}
return aResult;
}
} // anonymous namespace
......@@ -309,8 +302,7 @@ Diagram::Diagram( const Diagram & rOther ) :
m_xContext( rOther.m_xContext ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
{
lcl_tCooSysMapping aCooSysMapping =
lcl_CloneCoordinateSystems( rOther.m_aCoordSystems, m_aCoordSystems );
lcl_CloneCoordinateSystems( rOther.m_aCoordSystems, m_aCoordSystems );
ModifyListenerHelper::addListenerToAllElements( m_aCoordSystems, m_xModifyEventForwarder );
m_xWall.set( CloneHelper::CreateRefClone< beans::XPropertySet >()( rOther.m_xWall ));
......
......@@ -217,7 +217,15 @@ bool isExtraWarnUnusedType(clang::QualType type) {
auto const tc = TypeCheck(rec);
// Check some common non-LO types:
if (tc.Class("basic_string").StdNamespace()
|| tc.Class("deque").StdNamespace()
|| tc.Class("list").StdNamespace()
|| tc.Class("map").StdNamespace()
|| tc.Class("pair").StdNamespace()
|| tc.Class("queue").StdNamespace()
|| tc.Class("set").StdNamespace()
|| tc.Class("stack").StdNamespace()
|| tc.Class("unordered_map").StdNamespace()
|| tc.Class("unordered_set").StdNamespace()
|| tc.Class("vector").StdNamespace())
{
return true;
......
......@@ -109,7 +109,6 @@ void OHCatalog::refreshUsers()
if ( xResult.is() )
{
Reference< XRow > xRow(xResult,UNO_QUERY);
TString2IntMap aMap;
while( xResult->next() )
aVector.push_back(xRow->getString(1));
::comphelper::disposeComponent(xResult);
......
......@@ -96,7 +96,6 @@ void OMySQLCatalog::refreshUsers()
if ( xResult.is() )
{
Reference< XRow > xRow(xResult,UNO_QUERY);
TString2IntMap aMap;
while( xResult->next() )
aVector.push_back(xRow->getString(1));
::comphelper::disposeComponent(xResult);
......
......@@ -396,8 +396,6 @@ void Test::testCondCopyPasteSingleRowToRange()
ScRange aTargetRange(0,4,0,MAXCOL,4,0);
pasteOneCellFromClip(m_pDoc, aTargetRange, &aClipDoc);
std::set<sal_uLong> aCondFormatIndices;
ScConditionalFormat* pNewFormat = m_pDoc->GetCondFormat(0, 4, 0);
CPPUNIT_ASSERT(pNewFormat);
CPPUNIT_ASSERT(pNewFormat->GetKey() != pFormat->GetKey());
......@@ -429,8 +427,6 @@ void Test::testCondCopyPasteSingleRowToRange2()
ScRange aTargetRange(0,4,0,MAXCOL,4,0);
pasteOneCellFromClip(m_pDoc, aTargetRange, &aClipDoc);
std::set<sal_uLong> aCondFormatIndices;
for (SCCOL nCol = 0; nCol <= MAXCOL; ++nCol)
{
ScConditionalFormat* pNewFormat = m_pDoc->GetCondFormat(nCol, 4, 0);
......
......@@ -1566,7 +1566,6 @@ ScChart2DataProvider::createDataSource(
aSeqVector.push_back(aSeq);
}
::std::map< sal_Int32, uno::Reference< chart2::data::XLabeledDataSequence > > aSequenceMap;
for( sal_Int32 nNewIndex = 0; nNewIndex < aSequenceMapping.getLength(); nNewIndex++ )
{
// note: assuming that the values in the sequence mapping are always non-negative
......
......@@ -722,7 +722,6 @@ namespace slideshow
LayerShapeMap::iterator aCurrShapeEntry( maAllShapes.begin() );
LayerShapeMap::iterator aCurrLayerFirstShapeEntry( maAllShapes.begin() );
const LayerShapeMap::iterator aEndShapeEntry ( maAllShapes.end() );
ShapeUpdateSet aUpdatedShapes; // shapes that need update
while( aCurrShapeEntry != aEndShapeEntry )
{
const ShapeSharedPtr pCurrShape( aCurrShapeEntry->first );
......
......@@ -2382,9 +2382,6 @@ bool NotebookbarTabControlBase::ImplPlaceTabs( long nWidth )
aWidths.push_back(0);
}
//aBreakIndexes will contain the indexes of the last tab on each row
std::deque<size_t> aBreakIndexes(MinimumRaggednessWrap::GetEndOfLineIndexes(aWidths, nMaxWidth - nOffsetX - 2));
if ( (mnMaxPageWidth > 0) && (mnMaxPageWidth < nMaxWidth) )
nMaxWidth = mnMaxPageWidth;
nMaxWidth -= GetItemsOffset().X();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment