sc/source/filter/excel/xestream.cxx | 10 ++---
sc/source/filter/xml/xmlexprt.cxx | 71 +++++++++++++++++-------------------
sc/source/ui/unoobj/chart2uno.cxx | 51 ++++++++++++-------------
3 files changed, 65 insertions(+), 67 deletions(-)
New commits:
commit 031bf555256f8f827b4f32124f88c4012d28dcd3
Author: Eike Rathke <er...@redhat.com>
Date: Tue May 9 21:58:31 2017 +0200
Disambiguate Reference -> uno::Reference (tdf#107724 prep rel)
Change-Id: Ie456b0cff5f317a10b9dbfce58626d1b8a74fb49
Reviewed-on: https://gerrit.libreoffice.org/37440
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/sc/source/filter/excel/xestream.cxx
b/sc/source/filter/excel/xestream.cxx
index 75951cd6d4ae..4c5333100e70 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -926,7 +926,7 @@ sax_fastparser::FSHelperPtr XclXmlUtils::WriteFontData(
sax_fastparser::FSHelper
return pStream;
}
-XclExpXmlStream::XclExpXmlStream( const Reference< XComponentContext >& rCC,
bool bExportVBA )
+XclExpXmlStream::XclExpXmlStream( const uno::Reference< XComponentContext >&
rCC, bool bExportVBA )
: XmlFilterBase( rCC ),
mpRoot( nullptr ),
mbExportVBA(bExportVBA)
@@ -990,7 +990,7 @@ sax_fastparser::FSHelperPtr&
XclExpXmlStream::WriteAttributesInternal( sal_Int32
sax_fastparser::FSHelperPtr XclExpXmlStream::CreateOutputStream (
const OUString& sFullStream,
const OUString& sRelativeStream,
- const Reference< XOutputStream >& xParentRelation,
+ const uno::Reference< XOutputStream >& xParentRelation,
const char* sContentType,
const char* sRelationshipType,
OUString* pRelationshipId )
@@ -1039,7 +1039,7 @@ oox::drawingml::chart::ChartConverter*
XclExpXmlStream::getChartConverter()
ScDocShell* XclExpXmlStream::getDocShell()
{
- Reference< XInterface > xModel( getModel(), UNO_QUERY );
+ uno::Reference< XInterface > xModel( getModel(), UNO_QUERY );
ScModelObj *pObj = dynamic_cast < ScModelObj* >( xModel.get() );
@@ -1091,7 +1091,7 @@ bool XclExpXmlStream::exportDocument()
pWorkbookContentType =
"application/vnd.ms-excel.sheet.macroEnabled.main+xml";
PushStream( CreateOutputStream( workbook, workbook,
- Reference <XOutputStream>(),
+ uno::Reference <XOutputStream>(),
pWorkbookContentType,
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument";
) );
@@ -1139,7 +1139,7 @@ bool XclExpXmlStream::exportDocument()
::oox::ole::VbaProject* XclExpXmlStream::implCreateVbaProject() const
{
- return new ::oox::xls::ExcelVbaProject( getComponentContext(), Reference<
XSpreadsheetDocument >( getModel(), UNO_QUERY ) );
+ return new ::oox::xls::ExcelVbaProject( getComponentContext(),
uno::Reference< XSpreadsheetDocument >( getModel(), UNO_QUERY ) );
}
OUString XclExpXmlStream::getImplementationName()
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index c858096c42f9..0b0397072fe9 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -179,7 +179,6 @@ using namespace formula;
using namespace com::sun::star;
using namespace xmloff::token;
using ::std::vector;
-using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::UNO_QUERY;
namespace
@@ -1945,7 +1944,7 @@ void ScXMLExport::ExportContent_()
void ScXMLExport::ExportStyles_( bool bUsed )
{
- Reference <sheet::XSpreadsheetDocument> xSpreadDoc( GetModel(),
uno::UNO_QUERY );
+ uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( GetModel(),
uno::UNO_QUERY );
if (xSpreadDoc.is())
RegisterDefinedStyleNames( xSpreadDoc);
@@ -2096,7 +2095,7 @@ void ScXMLExport::AddStyleFromCells(const
uno::Reference<beans::XPropertySet>& x
bool bAdded = false;
if (nKey)
{
- Reference <sheet::XSpreadsheetDocument> xSpreadDoc(
GetModel(), uno::UNO_QUERY );
+ uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc(
GetModel(), uno::UNO_QUERY );
ScFormatSaveData* pFormatData =
ScModelObj::getImplementation(xSpreadDoc)->GetFormatSaveData();
auto itr = pFormatData->maIDToName.find(nKey);
if (itr != pFormatData->maIDToName.end())
@@ -2264,11 +2263,11 @@ void ScXMLExport::ExportAutoStyles_()
if (!GetModel().is())
return;
- Reference <sheet::XSpreadsheetDocument> xSpreadDoc( GetModel(),
uno::UNO_QUERY );
+ uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( GetModel(),
uno::UNO_QUERY );
if (!xSpreadDoc.is())
return;
- Reference<container::XIndexAccess> xIndex( xSpreadDoc->getSheets(),
uno::UNO_QUERY );
+ uno::Reference<container::XIndexAccess> xIndex( xSpreadDoc->getSheets(),
uno::UNO_QUERY );
if (!xIndex.is())
return;
@@ -2299,8 +2298,8 @@ void ScXMLExport::ExportAutoStyles_()
bool bCopySheet = pDoc->IsStreamValid(
static_cast<SCTAB>(nTable) );
if (bCopySheet)
{
- Reference <sheet::XSpreadsheet>
xTable(xIndex->getByIndex(nTable), uno::UNO_QUERY);
- Reference <beans::XPropertySet> xProperties(
+ uno::Reference <sheet::XSpreadsheet>
xTable(xIndex->getByIndex(nTable), uno::UNO_QUERY);
+ uno::Reference <beans::XPropertySet> xProperties(
xTable->getCellByPosition( aPos.Col(), aPos.Row() ),
uno::UNO_QUERY );
AddStyleFromCells(xProperties, xTable, nTable,
&aCellIter->maName);
@@ -2319,9 +2318,9 @@ void ScXMLExport::ExportAutoStyles_()
bool bCopySheet = pDoc->IsStreamValid(
static_cast<SCTAB>(nTable) );
if (bCopySheet)
{
- Reference<table::XColumnRowRange>
xColumnRowRange(xIndex->getByIndex(nTable), uno::UNO_QUERY);
- Reference<table::XTableColumns>
xTableColumns(xColumnRowRange->getColumns());
- Reference<beans::XPropertySet>
xColumnProperties(xTableColumns->getByIndex( aPos.Col() ), uno::UNO_QUERY);
+ uno::Reference<table::XColumnRowRange>
xColumnRowRange(xIndex->getByIndex(nTable), uno::UNO_QUERY);
+ uno::Reference<table::XTableColumns>
xTableColumns(xColumnRowRange->getColumns());
+ uno::Reference<beans::XPropertySet>
xColumnProperties(xTableColumns->getByIndex( aPos.Col() ), uno::UNO_QUERY);
sal_Int32 nIndex(-1);
bool bIsVisible(true);
@@ -2341,9 +2340,9 @@ void ScXMLExport::ExportAutoStyles_()
bool bCopySheet = pDoc->IsStreamValid(
static_cast<SCTAB>(nTable) );
if (bCopySheet)
{
- Reference<table::XColumnRowRange>
xColumnRowRange(xIndex->getByIndex(nTable), uno::UNO_QUERY);
- Reference<table::XTableRows>
xTableRows(xColumnRowRange->getRows());
- Reference<beans::XPropertySet>
xRowProperties(xTableRows->getByIndex( aPos.Row() ), uno::UNO_QUERY);
+ uno::Reference<table::XColumnRowRange>
xColumnRowRange(xIndex->getByIndex(nTable), uno::UNO_QUERY);
+ uno::Reference<table::XTableRows>
xTableRows(xColumnRowRange->getRows());
+ uno::Reference<beans::XPropertySet>
xRowProperties(xTableRows->getByIndex( aPos.Row() ), uno::UNO_QUERY);
sal_Int32 nIndex(-1);
AddStyleFromRow( xRowProperties, &aRowIter->maName, nIndex
);
@@ -2363,7 +2362,7 @@ void ScXMLExport::ExportAutoStyles_()
if (bCopySheet)
{
//! separate method AddStyleFromTable needed?
- Reference<beans::XPropertySet>
xTableProperties(xIndex->getByIndex(nTable), uno::UNO_QUERY);
+ uno::Reference<beans::XPropertySet>
xTableProperties(xIndex->getByIndex(nTable), uno::UNO_QUERY);
if (xTableProperties.is())
{
std::vector<XMLPropertyState>
aPropStates(xTableStylesExportPropertySetMapper->Filter(xTableProperties));
@@ -2399,7 +2398,7 @@ void ScXMLExport::ExportAutoStyles_()
{
SdrCaptionObj* pDrawObj = pNote->GetOrCreateCaption(
aPos );
// all uno shapes are created anyway in
CollectSharedData
- Reference<beans::XPropertySet> xShapeProperties(
pDrawObj->getUnoShape(), uno::UNO_QUERY );
+ uno::Reference<beans::XPropertySet> xShapeProperties(
pDrawObj->getUnoShape(), uno::UNO_QUERY );
if (xShapeProperties.is())
{
if ( !aNoteIter->maStyleName.isEmpty() )
@@ -2444,8 +2443,8 @@ void ScXMLExport::ExportAutoStyles_()
if (pNote)
{
SdrCaptionObj* pDrawObj = pNote->GetOrCreateCaption(
aPos );
- Reference<container::XEnumerationAccess>
xCellText(pDrawObj->getUnoShape(), uno::UNO_QUERY);
- Reference<beans::XPropertySet> xParaProp(
+ uno::Reference<container::XEnumerationAccess>
xCellText(pDrawObj->getUnoShape(), uno::UNO_QUERY);
+ uno::Reference<beans::XPropertySet> xParaProp(
lcl_GetEnumerated( xCellText,
aNoteParaIter->maSelection.nStartPara ), uno::UNO_QUERY );
if ( xParaProp.is() )
{
@@ -2479,8 +2478,8 @@ void ScXMLExport::ExportAutoStyles_()
if (pNote)
{
SdrCaptionObj* pDrawObj = pNote->GetOrCreateCaption(
aPos );
- Reference<text::XSimpleText>
xCellText(pDrawObj->getUnoShape(), uno::UNO_QUERY);
- Reference<beans::XPropertySet>
xCursorProp(xCellText->createTextCursor(), uno::UNO_QUERY);
+ uno::Reference<text::XSimpleText>
xCellText(pDrawObj->getUnoShape(), uno::UNO_QUERY);
+ uno::Reference<beans::XPropertySet>
xCursorProp(xCellText->createTextCursor(), uno::UNO_QUERY);
ScDrawTextCursor* pCursor =
ScDrawTextCursor::getImplementation( xCursorProp );
if (pCursor)
{
@@ -2512,9 +2511,9 @@ void ScXMLExport::ExportAutoStyles_()
//! separate method AddStyleFromText needed?
//! cache sheet object
- Reference<table::XCellRange>
xCellRange(xIndex->getByIndex(nTable), uno::UNO_QUERY);
- Reference<text::XSimpleText>
xCellText(xCellRange->getCellByPosition(aPos.Col(), aPos.Row()),
uno::UNO_QUERY);
- Reference<beans::XPropertySet>
xCursorProp(xCellText->createTextCursor(), uno::UNO_QUERY);
+ uno::Reference<table::XCellRange>
xCellRange(xIndex->getByIndex(nTable), uno::UNO_QUERY);
+ uno::Reference<text::XSimpleText>
xCellText(xCellRange->getCellByPosition(aPos.Col(), aPos.Row()),
uno::UNO_QUERY);
+ uno::Reference<beans::XPropertySet>
xCursorProp(xCellText->createTextCursor(), uno::UNO_QUERY);
ScCellTextCursor* pCursor =
ScCellTextCursor::getImplementation( xCursorProp );
if (pCursor)
{
@@ -2544,12 +2543,12 @@ void ScXMLExport::ExportAutoStyles_()
CollectShapesAutoStyles(nTableCount);
for (sal_Int32 nTable = 0; nTable < nTableCount; ++nTable,
IncrementProgressBar(false))
{
- Reference <sheet::XSpreadsheet> xTable(xIndex->getByIndex(nTable),
uno::UNO_QUERY);
+ uno::Reference <sheet::XSpreadsheet>
xTable(xIndex->getByIndex(nTable), uno::UNO_QUERY);
if (!xTable.is())
continue;
// table styles array must be complete, including copied tables -
Add should find the stored style
- Reference<beans::XPropertySet> xTableProperties(xTable,
uno::UNO_QUERY);
+ uno::Reference<beans::XPropertySet> xTableProperties(xTable,
uno::UNO_QUERY);
if (xTableProperties.is())
{
std::vector<XMLPropertyState>
aPropStates(xTableStylesExportPropertySetMapper->Filter(xTableProperties));
@@ -2563,20 +2562,20 @@ void ScXMLExport::ExportAutoStyles_()
}
// collect other auto-styles only for non-copied sheets
- Reference<sheet::XUniqueCellFormatRangesSupplier>
xCellFormatRanges ( xTable, uno::UNO_QUERY );
+ uno::Reference<sheet::XUniqueCellFormatRangesSupplier>
xCellFormatRanges ( xTable, uno::UNO_QUERY );
if ( xCellFormatRanges.is() )
{
- Reference<container::XIndexAccess>
xFormatRangesIndex(xCellFormatRanges->getUniqueCellFormatRanges());
+ uno::Reference<container::XIndexAccess>
xFormatRangesIndex(xCellFormatRanges->getUniqueCellFormatRanges());
if (xFormatRangesIndex.is())
{
sal_Int32
nFormatRangesCount(xFormatRangesIndex->getCount());
GetProgressBarHelper()->ChangeReference(GetProgressBarHelper()->GetReference()
+ nFormatRangesCount);
for (sal_Int32 nFormatRange = 0; nFormatRange <
nFormatRangesCount; ++nFormatRange)
{
- Reference< sheet::XSheetCellRanges>
xCellRanges(xFormatRangesIndex->getByIndex(nFormatRange), uno::UNO_QUERY);
+ uno::Reference< sheet::XSheetCellRanges>
xCellRanges(xFormatRangesIndex->getByIndex(nFormatRange), uno::UNO_QUERY);
if (xCellRanges.is())
{
- Reference <beans::XPropertySet> xProperties
(xCellRanges, uno::UNO_QUERY);
+ uno::Reference <beans::XPropertySet> xProperties
(xCellRanges, uno::UNO_QUERY);
if (xProperties.is())
{
AddStyleFromCells(xProperties, xTable, nTable,
nullptr);
@@ -2586,13 +2585,13 @@ void ScXMLExport::ExportAutoStyles_()
}
}
}
- Reference<table::XColumnRowRange> xColumnRowRange (xTable,
uno::UNO_QUERY);
+ uno::Reference<table::XColumnRowRange> xColumnRowRange (xTable,
uno::UNO_QUERY);
if (xColumnRowRange.is())
{
if (pDoc)
{
pDoc->SyncColRowFlags();
- Reference<table::XTableColumns>
xTableColumns(xColumnRowRange->getColumns());
+ uno::Reference<table::XTableColumns>
xTableColumns(xColumnRowRange->getColumns());
if (xTableColumns.is())
{
sal_Int32
nColumns(pDoc->GetLastChangedCol(sal::static_int_cast<SCTAB>(nTable)));
@@ -2610,7 +2609,7 @@ void ScXMLExport::ExportAutoStyles_()
{
sal_Int32 nIndex(-1);
bool bIsVisible(true);
- Reference <beans::XPropertySet>
xColumnProperties(xTableColumns->getByIndex(nColumn), uno::UNO_QUERY);
+ uno::Reference <beans::XPropertySet>
xColumnProperties(xTableColumns->getByIndex(nColumn), uno::UNO_QUERY);
if (xColumnProperties.is())
{
AddStyleFromColumn( xColumnProperties,
nullptr, nIndex, bIsVisible );
@@ -2629,7 +2628,7 @@ void ScXMLExport::ExportAutoStyles_()
pColumnStyles->AddFieldStyleName(nTable, i,
nIndex, bIsVisible);
}
}
- Reference<table::XTableRows>
xTableRows(xColumnRowRange->getRows());
+ uno::Reference<table::XTableRows>
xTableRows(xColumnRowRange->getRows());
if (xTableRows.is())
{
sal_Int32
nRows(pDoc->GetLastChangedRow(sal::static_int_cast<SCTAB>(nTable)));
@@ -2640,7 +2639,7 @@ void ScXMLExport::ExportAutoStyles_()
while (nRow <= MAXROW)
{
sal_Int32 nIndex = 0;
- Reference <beans::XPropertySet>
xRowProperties(xTableRows->getByIndex(nRow), uno::UNO_QUERY);
+ uno::Reference <beans::XPropertySet>
xRowProperties(xTableRows->getByIndex(nRow), uno::UNO_QUERY);
if(xRowProperties.is())
{
AddStyleFromRow( xRowProperties, nullptr,
nIndex );
@@ -2816,7 +2815,7 @@ bool ScXMLExport::IsMatrix (const ScAddress& aCell,
return false;
}
-void ScXMLExport::WriteTable(sal_Int32 nTable, const
Reference<sheet::XSpreadsheet>& xTable)
+void ScXMLExport::WriteTable(sal_Int32 nTable, const
uno::Reference<sheet::XSpreadsheet>& xTable)
{
if (!xTable.is())
return;
@@ -3597,7 +3596,7 @@ void ScXMLExport::exportAnnotationMeta( const
uno::Reference < drawing::XShape >
//is it still useful, as this call back is only called from
ScXMLExport::WriteAnnotation
// and should be in sync with pCurrentCell
SdrCaptionObj* pNoteCaption =
pNote->GetOrCreateCaption(pCurrentCell->maCellAddress);
- Reference<drawing::XShape> xCurrentShape( pNoteCaption->getUnoShape(),
uno::UNO_QUERY );
+ uno::Reference<drawing::XShape> xCurrentShape(
pNoteCaption->getUnoShape(), uno::UNO_QUERY );
if (xCurrentShape.get()!=xShape.get())
return;
@@ -3656,7 +3655,7 @@ void ScXMLExport::WriteAnnotation(ScMyCell& rMyCell)
SdrCaptionObj* pNoteCaption =
pNote->GetOrCreateCaption(rMyCell.maCellAddress);
if (pNoteCaption)
{
- Reference<drawing::XShape> xShape( pNoteCaption->getUnoShape(),
uno::UNO_QUERY );
+ uno::Reference<drawing::XShape> xShape(
pNoteCaption->getUnoShape(), uno::UNO_QUERY );
if (xShape.is())
GetShapeExport()->exportShape(xShape,
SEF_DEFAULT|XMLShapeExportFlags::ANNOTATION);
}
diff --git a/sc/source/ui/unoobj/chart2uno.cxx
b/sc/source/ui/unoobj/chart2uno.cxx
index 6a24e7dbeec8..fdf69927f950 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -72,7 +72,6 @@ SC_SIMPLE_SERVICE_INFO( ScChart2DataSequence,
"ScChart2DataSequence",
using namespace ::com::sun::star;
using namespace ::formula;
using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::uno::Reference;
using ::std::unique_ptr;
using ::std::vector;
using ::std::list;
@@ -1045,30 +1044,30 @@ sal_Bool SAL_CALL
ScChart2DataProvider::createDataSourcePossible( const uno::Seq
namespace
{
-Reference< chart2::data::XLabeledDataSequence >
lcl_createLabeledDataSequenceFromTokens(
+uno::Reference< chart2::data::XLabeledDataSequence >
lcl_createLabeledDataSequenceFromTokens(
vector< ScTokenRef > && aValueTokens, vector< ScTokenRef > && aLabelTokens,
- ScDocument* pDoc, const Reference< chart2::data::XDataProvider >& xDP,
bool bIncludeHiddenCells )
+ ScDocument* pDoc, const uno::Reference< chart2::data::XDataProvider >&
xDP, bool bIncludeHiddenCells )
{
- Reference< chart2::data::XLabeledDataSequence > xResult;
+ uno::Reference< chart2::data::XLabeledDataSequence > xResult;
bool bHasValues = !aValueTokens.empty();
bool bHasLabel = !aLabelTokens.empty();
if( bHasValues || bHasLabel )
{
try
{
- Reference< uno::XComponentContext > xContext(
::comphelper::getProcessComponentContext() );
+ uno::Reference< uno::XComponentContext > xContext(
::comphelper::getProcessComponentContext() );
if ( xContext.is() )
{
xResult.set(
chart2::data::LabeledDataSequence::create(xContext), uno::UNO_QUERY_THROW );
}
if ( bHasValues )
{
- Reference< chart2::data::XDataSequence > xSeq( new
ScChart2DataSequence( pDoc, xDP, std::move(aValueTokens), bIncludeHiddenCells )
);
+ uno::Reference< chart2::data::XDataSequence > xSeq( new
ScChart2DataSequence( pDoc, xDP, std::move(aValueTokens), bIncludeHiddenCells )
);
xResult->setValues( xSeq );
}
if ( bHasLabel )
{
- Reference< chart2::data::XDataSequence > xLabelSeq( new
ScChart2DataSequence( pDoc, xDP, std::move(aLabelTokens), bIncludeHiddenCells )
);
+ uno::Reference< chart2::data::XDataSequence > xLabelSeq( new
ScChart2DataSequence( pDoc, xDP, std::move(aLabelTokens), bIncludeHiddenCells )
);
xResult->setLabel( xLabelSeq );
}
}
@@ -1516,7 +1515,7 @@ ScChart2DataProvider::createDataSource(
return xResult;
ScChart2DataSource* pDS = nullptr;
- ::std::list< Reference< chart2::data::XLabeledDataSequence > > aSeqs;
+ ::std::list< uno::Reference< chart2::data::XLabeledDataSequence > > aSeqs;
// Fill Categories
if( bCategories )
@@ -1530,7 +1529,7 @@ ScChart2DataProvider::createDataSource(
vector<ScTokenRef> aLabelTokens(
pChartMap->getLeftUpperCornerRanges());
- Reference< chart2::data::XLabeledDataSequence > xCategories =
lcl_createLabeledDataSequenceFromTokens(
+ uno::Reference< chart2::data::XLabeledDataSequence > xCategories =
lcl_createLabeledDataSequenceFromTokens(
std::move(aValueTokens), std::move(aLabelTokens), m_pDocument,
this, m_bIncludeHiddenCells ); //ownership of pointers is transferred!
if ( xCategories.is() )
{
@@ -1554,7 +1553,7 @@ ScChart2DataProvider::createDataSource(
aValueTokens = pChartMap->getDataRowRanges(static_cast<SCROW>(i));
aLabelTokens =
pChartMap->getRowHeaderRanges(static_cast<SCROW>(i));
}
- Reference< chart2::data::XLabeledDataSequence > xChartSeries =
lcl_createLabeledDataSequenceFromTokens(
+ uno::Reference< chart2::data::XLabeledDataSequence > xChartSeries =
lcl_createLabeledDataSequenceFromTokens(
std::move(aValueTokens), std::move(aLabelTokens), m_pDocument,
this, m_bIncludeHiddenCells ); //ownership of pointers is transferred!
if ( xChartSeries.is() && xChartSeries->getValues().is() &&
xChartSeries->getValues()->getData().getLength() )
{
@@ -1563,22 +1562,22 @@ ScChart2DataProvider::createDataSource(
}
pDS = new ScChart2DataSource(m_pDocument);
- ::std::list< Reference< chart2::data::XLabeledDataSequence > >::iterator
aItr( aSeqs.begin() );
- ::std::list< Reference< chart2::data::XLabeledDataSequence > >::iterator
aEndItr( aSeqs.end() );
+ ::std::list< uno::Reference< chart2::data::XLabeledDataSequence >
>::iterator aItr( aSeqs.begin() );
+ ::std::list< uno::Reference< chart2::data::XLabeledDataSequence >
>::iterator aEndItr( aSeqs.end() );
//reorder labeled sequences according to aSequenceMapping
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > >
aSeqVector;
+ ::std::vector< uno::Reference< chart2::data::XLabeledDataSequence > >
aSeqVector;
while(aItr != aEndItr)
{
aSeqVector.push_back(*aItr);
++aItr;
}
- ::std::map< sal_Int32, Reference< chart2::data::XLabeledDataSequence > >
aSequenceMap;
+ ::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
- ::std::vector< Reference< chart2::data::XLabeledDataSequence >
>::size_type nOldIndex( static_cast< sal_uInt32 >( aSequenceMapping[nNewIndex]
) );
+ ::std::vector< uno::Reference< chart2::data::XLabeledDataSequence >
>::size_type nOldIndex( static_cast< sal_uInt32 >( aSequenceMapping[nNewIndex]
) );
if( nOldIndex < aSeqVector.size() )
{
pDS->AddLabeledSequence( aSeqVector[nOldIndex] );
@@ -1586,11 +1585,11 @@ ScChart2DataProvider::createDataSource(
}
}
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > >::iterator
aVectorItr( aSeqVector.begin() );
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > >::iterator
aVectorEndItr( aSeqVector.end() );
+ ::std::vector< uno::Reference< chart2::data::XLabeledDataSequence >
>::iterator aVectorItr( aSeqVector.begin() );
+ ::std::vector< uno::Reference< chart2::data::XLabeledDataSequence >
>::iterator aVectorEndItr( aSeqVector.end() );
while(aVectorItr != aVectorEndItr)
{
- Reference< chart2::data::XLabeledDataSequence > xSeq( *aVectorItr );
+ uno::Reference< chart2::data::XLabeledDataSequence > xSeq( *aVectorItr
);
if ( xSeq.is() )
{
pDS->AddLabeledSequence( xSeq );
@@ -1801,18 +1800,18 @@ uno::Sequence< beans::PropertyValue > SAL_CALL
ScChart2DataProvider::detectArgum
sal_Int32 nDataInCols = 0;
bool bRowSourceAmbiguous = false;
- Sequence< Reference< chart2::data::XLabeledDataSequence > >
aSequences( xDataSource->getDataSequences());
+ Sequence< uno::Reference< chart2::data::XLabeledDataSequence > >
aSequences( xDataSource->getDataSequences());
const sal_Int32 nCount( aSequences.getLength());
RangeAnalyzer aPrevLabel,aPrevValues;
for( sal_Int32 nIdx=0; nIdx<nCount; ++nIdx )
{
- Reference< chart2::data::XLabeledDataSequence >
xLS(aSequences[nIdx]);
+ uno::Reference< chart2::data::XLabeledDataSequence >
xLS(aSequences[nIdx]);
if( xLS.is() )
{
bool bThisIsCategories = false;
if(!bHasCategories)
{
- Reference< beans::XPropertySet > xSeqProp(
xLS->getValues(), uno::UNO_QUERY );
+ uno::Reference< beans::XPropertySet > xSeqProp(
xLS->getValues(), uno::UNO_QUERY );
OUString aRole;
if( xSeqProp.is() && (xSeqProp->getPropertyValue("Role")
>>= aRole) &&
aRole == "categories" )
@@ -1821,7 +1820,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL
ScChart2DataProvider::detectArgum
RangeAnalyzer aLabel,aValues;
// label
- Reference< chart2::data::XDataSequence > xLabel(
xLS->getLabel());
+ uno::Reference< chart2::data::XDataSequence > xLabel(
xLS->getLabel());
if( xLabel.is())
{
bFirstCellAsLabel = true;
@@ -1841,7 +1840,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL
ScChart2DataProvider::detectArgum
bHasCategoriesLabels=true;
}
// values
- Reference< chart2::data::XDataSequence > xValues(
xLS->getValues());
+ uno::Reference< chart2::data::XDataSequence > xValues(
xLS->getValues());
if( xValues.is())
{
vector<ScTokenRef> aTokens;
@@ -2148,11 +2147,11 @@ sal_Bool SAL_CALL
ScChart2DataProvider::createDataSequenceByFormulaTokensPossibl
return true;
}
-Reference<chart2::data::XDataSequence> SAL_CALL
+uno::Reference<chart2::data::XDataSequence> SAL_CALL
ScChart2DataProvider::createDataSequenceByFormulaTokens(
const Sequence<sheet::FormulaToken>& aTokens )
{
- Reference<chart2::data::XDataSequence> xResult;
+ uno::Reference<chart2::data::XDataSequence> xResult;
if (aTokens.getLength() <= 0)
return xResult;
@@ -3231,7 +3230,7 @@ uno::Reference< util::XCloneable > SAL_CALL
ScChart2DataSequence::createClone()
rtl::Reference<ScChart2DataSequence> p(new
ScChart2DataSequence(m_pDocument, m_xDataProvider, std::move(aTokensNew),
m_bIncludeHiddenCells));
p->CopyData(*this);
- Reference< util::XCloneable > xClone(p.get());
+ uno::Reference< util::XCloneable > xClone(p.get());
return xClone;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
