summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-02-24 11:22:18 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-02-28 10:17:47 +0000
commit198c41c4fe8be4ce8a6ddab43ae0c5f17a4889ac (patch)
tree041d55126e9770b81f68fadfaaa69e82313786b3 /xmloff
parentd3981b3e8c021ee03a2ca7103a73e56cca18df81 (diff)
new loplugin unoany
Change-Id: I5d6c4a67cb2a09e7cd5bd620c6b262d188701b89 Reviewed-on: https://gerrit.libreoffice.org/34714 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/chart/SchXMLAxisContext.cxx12
-rw-r--r--xmloff/source/chart/SchXMLExport.cxx2
-rw-r--r--xmloff/source/chart/SchXMLPlotAreaContext.cxx2
-rw-r--r--xmloff/source/chart/SchXMLSeriesHelper.cxx6
-rw-r--r--xmloff/source/chart/SchXMLTableContext.cxx6
-rw-r--r--xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx2
-rw-r--r--xmloff/source/core/DocumentSettingsContext.cxx4
-rw-r--r--xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx4
-rw-r--r--xmloff/source/text/XMLIndexBibliographyEntryContext.cxx2
-rw-r--r--xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx4
-rw-r--r--xmloff/source/text/XMLIndexSimpleEntryContext.cxx2
-rw-r--r--xmloff/source/text/txtimp.cxx8
12 files changed, 27 insertions, 27 deletions
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx
index 3172b6009888..3c72187bc5a1 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -349,7 +349,7 @@ bool lcl_divideBy100( uno::Any& rDoubleAny )
if( (rDoubleAny>>=fValue) && (fValue!=0.0) )
{
fValue/=100.0;
- rDoubleAny = uno::makeAny(fValue);
+ rDoubleAny <<= fValue;
bChanged = true;
}
return bChanged;
@@ -945,7 +945,7 @@ void DateScaleContext::StartElement( const Reference< xml::sax::XAttributeList >
{
case XML_TOK_DATESCALE_BASE_TIME_UNIT:
{
- aIncrement.TimeResolution = uno::makeAny( lcl_getTimeUnit(aValue) );
+ aIncrement.TimeResolution <<= lcl_getTimeUnit(aValue);
bSetNewIncrement = true;
}
break;
@@ -954,7 +954,7 @@ void DateScaleContext::StartElement( const Reference< xml::sax::XAttributeList >
chart::TimeInterval aInterval(1,0);
aIncrement.MajorTimeInterval >>= aInterval;
::sax::Converter::convertNumber( aInterval.Number, aValue );
- aIncrement.MajorTimeInterval = uno::makeAny(aInterval);
+ aIncrement.MajorTimeInterval <<= aInterval;
bSetNewIncrement = true;
}
break;
@@ -963,7 +963,7 @@ void DateScaleContext::StartElement( const Reference< xml::sax::XAttributeList >
chart::TimeInterval aInterval(1,0);
aIncrement.MajorTimeInterval >>= aInterval;
aInterval.TimeUnit = lcl_getTimeUnit(aValue);
- aIncrement.MajorTimeInterval = uno::makeAny(aInterval);
+ aIncrement.MajorTimeInterval <<= aInterval;
bSetNewIncrement = true;
}
break;
@@ -972,7 +972,7 @@ void DateScaleContext::StartElement( const Reference< xml::sax::XAttributeList >
chart::TimeInterval aInterval(1,0);
aIncrement.MinorTimeInterval >>= aInterval;
::sax::Converter::convertNumber( aInterval.Number, aValue );
- aIncrement.MinorTimeInterval = uno::makeAny(aInterval);
+ aIncrement.MinorTimeInterval <<= aInterval;
bSetNewIncrement = true;
}
break;
@@ -981,7 +981,7 @@ void DateScaleContext::StartElement( const Reference< xml::sax::XAttributeList >
chart::TimeInterval aInterval(1,0);
aIncrement.MinorTimeInterval >>= aInterval;
aInterval.TimeUnit = lcl_getTimeUnit(aValue);
- aIncrement.MinorTimeInterval = uno::makeAny(aInterval);
+ aIncrement.MinorTimeInterval <<= aInterval;
bSetNewIncrement = true;
}
break;
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index b1c58a0458a8..ef7d581edd96 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -874,7 +874,7 @@ lcl_TableData lcl_getDataForLocalTable(
Sequence< Any >& rTarget = rComplexAnyLabels[nN];
rTarget.realloc( rSource.getLength() );
for( sal_Int32 i=0; i<rSource.getLength(); i++ )
- rTarget[i] = uno::makeAny( rSource[i] );
+ rTarget[i] <<= rSource[i];
}
}
catch( const uno::Exception & rEx )
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 48a5a9a9f05f..bf3e95b85445 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -373,7 +373,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
{
if( maChartTypeServiceName == "com.sun.star.chart2.AreaChartType" || maChartTypeServiceName == "com.sun.star.chart2.LineChartType" )
{
- aDeepProperty = uno::makeAny( true );
+ aDeepProperty <<= true;
}
}
}
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx
index e2edd3f725a3..3f5173d308c5 100644
--- a/xmloff/source/chart/SchXMLSeriesHelper.cxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx
@@ -185,7 +185,7 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPISeriesProp
if(xInit.is())
{
Sequence< uno::Any > aArguments(1);
- aArguments[0]=uno::makeAny(xSeries);
+ aArguments[0] <<= xSeries;
xInit->initialize(aArguments);
}
}
@@ -219,8 +219,8 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPIDataPointP
if(xInit.is())
{
Sequence< uno::Any > aArguments(2);
- aArguments[0]=uno::makeAny(xSeries);
- aArguments[1]=uno::makeAny(nPointIndex);
+ aArguments[0] <<= xSeries;
+ aArguments[1] <<= nPointIndex;
xInit->initialize(aArguments);
}
}
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index e5d1b6d839d8..80f6c686f611 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -721,19 +721,19 @@ static void lcl_ApplyCellToComplexLabel( const SchXMLCell& rCell, Sequence< uno:
if( rCell.eType == SCH_CELL_TYPE_STRING )
{
rComplexLabel.realloc(1);
- rComplexLabel[0] = uno::makeAny( rCell.aString );
+ rComplexLabel[0] <<= rCell.aString;
}
else if( rCell.aComplexString.getLength() && rCell.eType == SCH_CELL_TYPE_COMPLEX_STRING )
{
sal_Int32 nCount = rCell.aComplexString.getLength();
rComplexLabel.realloc( nCount );
for( sal_Int32 nN=0; nN<nCount; nN++)
- rComplexLabel[nN] = uno::makeAny((rCell.aComplexString)[nN]);
+ rComplexLabel[nN] <<= (rCell.aComplexString)[nN];
}
else if( rCell.eType == SCH_CELL_TYPE_FLOAT )
{
rComplexLabel.realloc(1);
- rComplexLabel[0] = uno::makeAny( rCell.fValue );
+ rComplexLabel[0] <<= rCell.fValue;
}
}
diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
index 49237aa6b105..12abe339db8c 100644
--- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
+++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
@@ -48,7 +48,7 @@ bool XMLErrorBarStylePropertyHdl::exportXML( OUString& rStrExpValue,
|| nValue == css::chart::ErrorBarStyle::FROM_DATA )
{
nValue = css::chart::ErrorBarStyle::NONE;
- aValue = uno::makeAny(nValue);
+ aValue <<= nValue;
}
}
}
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index cfb2bc0b6f63..6dfe2e723967 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -391,13 +391,13 @@ void XMLDocumentSettingsContext::EndElement()
if ( sProp == "PrinterName" )
{
- aSeqConfigProps[i].Value = uno::makeAny( OUString() );
+ aSeqConfigProps[i].Value <<= OUString();
nFound++;
}
else if ( sProp == "PrinterSetup" )
{
uno::Sequence< sal_Int8 > aEmpty;
- aSeqConfigProps[i].Value = uno::makeAny( aEmpty );
+ aSeqConfigProps[i].Value <<= aEmpty;
nFound++;
}
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index f5c980621518..b0b6cce5817a 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -194,12 +194,12 @@ SvXMLImportContext *XMLIndexBibliographyConfigurationContext::CreateChildContext
PropertyValue aNameValue;
aNameValue.Name = sSortKey;
- aNameValue.Value = Any((sal_Int16)nKey);
+ aNameValue.Value <<= (sal_Int16)nKey;
aKey[0] = aNameValue;
PropertyValue aSortValue;
aSortValue.Name = sIsSortAscending;
- aSortValue.Value = Any(bSort);
+ aSortValue.Value <<= bSort;
aKey[1] = aSortValue;
aSortKeys.push_back(aKey);
diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
index cd17da5cbac3..32ff795e6680 100644
--- a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
@@ -155,7 +155,7 @@ void XMLIndexBibliographyEntryContext::FillPropertyValues(
// bibliography data field
sal_Int32 nIndex = bCharStyleNameOK ? 2 : 1;
rValues[nIndex].Name = "BibliographyDataField";
- rValues[nIndex].Value = css::uno::Any(nBibliographyInfo);
+ rValues[nIndex].Value <<= nBibliographyInfo;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
index ce125aaaeedb..f7db32e331bb 100644
--- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
@@ -177,13 +177,13 @@ void XMLIndexChapterInfoEntryContext::FillPropertyValues(
{
// chapter info field
rValues[nIndex].Name = "ChapterFormat";
- rValues[nIndex].Value = css::uno::Any(nChapterInfo);
+ rValues[nIndex].Value <<= nChapterInfo;
nIndex++;
}
if( bOutlineLevelOK )
{
rValues[nIndex].Name = "ChapterLevel";
- rValues[nIndex].Value = css::uno::Any(nOutlineLevel);
+ rValues[nIndex].Value <<= nOutlineLevel;
}
}
diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
index f8e8d3e1b9db..aa7b6ec2454a 100644
--- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
@@ -108,7 +108,7 @@ void XMLIndexSimpleEntryContext::FillPropertyValues(
// token type
rValues[0].Name = "TokenType";
- rValues[0].Value = css::uno::Any(rEntryType);
+ rValues[0].Value <<= rEntryType;
// char style
if (bCharStyleNameOK)
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 04f579e410ae..c1f552df985b 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -846,12 +846,12 @@ namespace
if(pCurrent->first == ODF_FORMDROPDOWN_RESULT)
{
// sal_Int32
- vOutParams[pCurrent->first] = makeAny(pCurrent->second.toInt32());
+ vOutParams[pCurrent->first] <<= pCurrent->second.toInt32();
}
else if(pCurrent->first == ODF_FORMCHECKBOX_RESULT)
{
// bool
- vOutParams[pCurrent->first] = makeAny(pCurrent->second.toBoolean());
+ vOutParams[pCurrent->first] <<= pCurrent->second.toBoolean();
}
else if(pCurrent->first == ODF_FORMDROPDOWN_LISTENTRY)
{
@@ -859,13 +859,13 @@ namespace
vListEntries.push_back(pCurrent->second);
}
else
- vOutParams[pCurrent->first] = makeAny(pCurrent->second);
+ vOutParams[pCurrent->first] <<= pCurrent->second;
}
if(!vListEntries.empty())
{
Sequence<OUString> vListEntriesSeq(vListEntries.size());
copy(vListEntries.begin(), vListEntries.end(), vListEntriesSeq.begin());
- vOutParams[OUString(ODF_FORMDROPDOWN_LISTENTRY)] = makeAny(vListEntriesSeq);
+ vOutParams[OUString(ODF_FORMDROPDOWN_LISTENTRY)] <<= vListEntriesSeq;
}
for(::std::map<OUString, Any>::const_iterator pCurrent = vOutParams.begin();
pCurrent != vOutParams.end();