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/TablePivotCharts.cxx10
-rw-r--r--sc/source/ui/unoobj/afmtuno.cxx6
-rw-r--r--sc/source/ui/unoobj/appluno.cxx4
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx14
-rw-r--r--sc/source/ui/unoobj/cellvaluebinding.cxx2
-rw-r--r--sc/source/ui/unoobj/chart2uno.cxx12
-rw-r--r--sc/source/ui/unoobj/chartuno.cxx12
-rw-r--r--sc/source/ui/unoobj/datauno.cxx8
-rw-r--r--sc/source/ui/unoobj/docuno.cxx20
-rw-r--r--sc/source/ui/unoobj/fielduno.cxx40
-rw-r--r--sc/source/ui/unoobj/fmtuno.cxx4
-rw-r--r--sc/source/ui/unoobj/linkuno.cxx10
-rw-r--r--sc/source/ui/unoobj/nameuno.cxx6
-rw-r--r--sc/source/ui/unoobj/styleuno.cxx8
-rw-r--r--sc/source/ui/unoobj/targuno.cxx4
-rw-r--r--sc/source/ui/unoobj/viewuno.cxx6
16 files changed, 83 insertions, 83 deletions
diff --git a/sc/source/ui/unoobj/TablePivotCharts.cxx b/sc/source/ui/unoobj/TablePivotCharts.cxx
index e4d09f459f91..8e9203fe4223 100644
--- a/sc/source/ui/unoobj/TablePivotCharts.cxx
+++ b/sc/source/ui/unoobj/TablePivotCharts.cxx
@@ -143,9 +143,9 @@ void SAL_CALL TablePivotCharts::addNewByName(OUString const & rName,
xReceiver->attachNumberFormatsSupplier(xNumberFormatsSupplier);
uno::Sequence<beans::PropertyValue> aArgs( comphelper::InitPropertySequence({
- { "CellRangeRepresentation", uno::makeAny(rDataPilotName) },
- { "HasCategories", uno::makeAny(true) },
- { "DataRowSource", uno::makeAny(chart::ChartDataRowSource_COLUMNS) }
+ { "CellRangeRepresentation", uno::Any(rDataPilotName) },
+ { "HasCategories", uno::Any(true) },
+ { "DataRowSource", uno::Any(chart::ChartDataRowSource_COLUMNS) }
}));
xReceiver->setArguments(aArgs);
}
@@ -218,7 +218,7 @@ uno::Any SAL_CALL TablePivotCharts::getByIndex(sal_Int32 nIndex)
if (!xChart.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xChart);
+ return uno::Any(xChart);
}
uno::Type SAL_CALL TablePivotCharts::getElementType()
@@ -244,7 +244,7 @@ uno::Any SAL_CALL TablePivotCharts::getByName(OUString const & rName)
if (!xChart.is())
throw container::NoSuchElementException();
- return uno::makeAny(xChart);
+ return uno::Any(xChart);
}
uno::Sequence<OUString> SAL_CALL TablePivotCharts::getElementNames()
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index 15a8bcbafe1b..6507ce6e2ec2 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -280,7 +280,7 @@ uno::Any SAL_CALL ScAutoFormatsObj::getByIndex( sal_Int32 nIndex )
uno::Reference< container::XNamed > xFormat(GetObjectByIndex_Impl(static_cast<sal_uInt16>(nIndex)));
if (!xFormat.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xFormat);
+ return uno::Any(xFormat);
}
uno::Type SAL_CALL ScAutoFormatsObj::getElementType()
@@ -303,7 +303,7 @@ uno::Any SAL_CALL ScAutoFormatsObj::getByName( const OUString& aName )
uno::Reference< container::XNamed > xFormat(GetObjectByName_Impl(aName));
if (!xFormat.is())
throw container::NoSuchElementException();
- return uno::makeAny(xFormat);
+ return uno::Any(xFormat);
}
uno::Sequence<OUString> SAL_CALL ScAutoFormatsObj::getElementNames()
@@ -397,7 +397,7 @@ uno::Any SAL_CALL ScAutoFormatObj::getByIndex( sal_Int32 nIndex )
throw lang::IndexOutOfBoundsException();
if (IsInserted())
- return uno::makeAny(uno::Reference< beans::XPropertySet >(GetObjectByIndex_Impl(static_cast<sal_uInt16>(nIndex))));
+ return uno::Any(uno::Reference< beans::XPropertySet >(GetObjectByIndex_Impl(static_cast<sal_uInt16>(nIndex))));
return uno::Any();
}
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index af81993e231c..841d9b2f0315 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -518,7 +518,7 @@ uno::Any SAL_CALL ScFunctionListObj::getByName( const OUString& aName )
{
uno::Sequence<beans::PropertyValue> aSeq( SC_FUNCDESC_PROPCOUNT );
lcl_FillSequence( aSeq, *pDesc );
- return uno::makeAny(aSeq);
+ return uno::Any(aSeq);
}
}
@@ -551,7 +551,7 @@ uno::Any SAL_CALL ScFunctionListObj::getByIndex( sal_Int32 nIndex )
{
uno::Sequence<beans::PropertyValue> aSeq( SC_FUNCDESC_PROPCOUNT );
lcl_FillSequence( aSeq, *pDesc );
- return uno::makeAny(aSeq);
+ return uno::Any(aSeq);
}
}
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 70873df00568..9901466102e4 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -4482,7 +4482,7 @@ uno::Any SAL_CALL ScCellRangesObj::getByIndex( sal_Int32 nIndex )
if (!xRange.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xRange);
+ return uno::Any(xRange);
}
@@ -6039,7 +6039,7 @@ void SAL_CALL ScCellObj::insertTextContent( const uno::Reference<text::XTextRang
}
if (pCellField->GetFieldType() == text::textfield::Type::TABLE)
- pCellField->setPropertyValue(SC_UNONAME_TABLEPOS, uno::makeAny<sal_Int32>(aCellPos.Tab()));
+ pCellField->setPropertyValue(SC_UNONAME_TABLEPOS, uno::Any(sal_Int32(aCellPos.Tab())));
SvxFieldItem aItem = pCellField->CreateFieldItem();
SvxTextForwarder* pForwarder = pEditSource->GetTextForwarder();
@@ -8779,7 +8779,7 @@ uno::Any SAL_CALL ScCellsEnumeration::nextElement()
ScAddress aTempPos(aPos);
Advance_Impl();
- return uno::makeAny(uno::Reference<table::XCell>(new ScCellObj( pDocShell, aTempPos )));
+ return uno::Any(uno::Reference<table::XCell>(new ScCellObj( pDocShell, aTempPos )));
}
throw container::NoSuchElementException(); // no more elements
@@ -8877,7 +8877,7 @@ uno::Any SAL_CALL ScCellFormatsObj::getByIndex( sal_Int32 nIndex )
if (!xRange.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xRange);
+ return uno::Any(xRange);
}
@@ -9004,7 +9004,7 @@ uno::Any SAL_CALL ScCellFormatsEnumeration::nextElement()
// interface must match ScCellFormatsObj::getElementType
- return uno::makeAny(uno::Reference<table::XCellRange> (NextObject_Impl()));
+ return uno::Any(uno::Reference<table::XCellRange> (NextObject_Impl()));
}
ScUniqueCellFormatsObj::~ScUniqueCellFormatsObj()
@@ -9230,7 +9230,7 @@ uno::Any SAL_CALL ScUniqueCellFormatsObj::getByIndex( sal_Int32 nIndex )
if(o3tl::make_unsigned(nIndex) >= aRangeLists.size())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(uno::Reference<sheet::XSheetCellRangeContainer>(new ScCellRangesObj(pDocShell, aRangeLists[nIndex])));
+ return uno::Any(uno::Reference<sheet::XSheetCellRangeContainer>(new ScCellRangesObj(pDocShell, aRangeLists[nIndex])));
}
@@ -9302,7 +9302,7 @@ uno::Any SAL_CALL ScUniqueCellFormatsEnumeration::nextElement()
// interface type must match ScCellFormatsObj::getElementType
- return uno::makeAny(uno::Reference<sheet::XSheetCellRangeContainer>(new ScCellRangesObj(pDocShell, aRangeLists[nCurrentPosition++])));
+ return uno::Any(uno::Reference<sheet::XSheetCellRangeContainer>(new ScCellRangesObj(pDocShell, aRangeLists[nCurrentPosition++])));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx
index 701743277e43..6bf868cf37cb 100644
--- a/sc/source/ui/unoobj/cellvaluebinding.cxx
+++ b/sc/source/ui/unoobj/cellvaluebinding.cxx
@@ -386,7 +386,7 @@ namespace calc
if ( !bWasBoolean )
{
sal_Int32 nNewIndex = xTypes->getStandardFormat( NumberFormat::LOGICAL, aLocale );
- xCellProp->setPropertyValue( sPropName, makeAny( nNewIndex ) );
+ xCellProp->setPropertyValue( sPropName, Any( nNewIndex ) );
}
}
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 9ca2e73bd4ec..194b166e6bf5 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1930,7 +1930,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
func = ::std::for_each(aAllTokens.begin(), aAllTokens.end(), func);
func.getVector(aTableNumVector);
aResult.emplace_back( "TableNumberList", -1,
- uno::makeAny( lcl_createTableNumberList( aTableNumVector ) ),
+ uno::Any( lcl_createTableNumberList( aTableNumVector ) ),
beans::PropertyState_DIRECT_VALUE );
}
@@ -1938,13 +1938,13 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
{
// DataRowSource (calculated before)
aResult.emplace_back( "DataRowSource", -1,
- uno::makeAny( eRowSource ), beans::PropertyState_DIRECT_VALUE );
+ uno::Any( eRowSource ), beans::PropertyState_DIRECT_VALUE );
// HasCategories
aResult.emplace_back( "HasCategories", -1,
- uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE );
+ uno::Any( bHasCategories ), beans::PropertyState_DIRECT_VALUE );
// FirstCellAsLabel
aResult.emplace_back( "FirstCellAsLabel", -1,
- uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE );
+ uno::Any( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE );
}
// Add the left upper corner to the range if it is missing.
@@ -1969,7 +1969,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
// add cell range property
aResult.emplace_back( "CellRangeRepresentation", -1,
- uno::makeAny( sRangeRep ), beans::PropertyState_DIRECT_VALUE );
+ uno::Any( sRangeRep ), beans::PropertyState_DIRECT_VALUE );
//Sequence Mapping
bool const bSequencesReordered = true;//todo detect this above or detect this sequence mapping cheaper ...
@@ -2029,7 +2029,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
if( bDifferentIndexes && !aSequenceMappingVector.empty() )
{
aResult.emplace_back( "SequenceMapping", -1,
- uno::makeAny( comphelper::containerToSequence(aSequenceMappingVector) )
+ uno::Any( comphelper::containerToSequence(aSequenceMappingVector) )
, beans::PropertyState_DIRECT_VALUE );
}
}
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 9bf802f812d5..03018c6505b0 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -226,16 +226,16 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString& rName,
uno::Sequence< beans::PropertyValue > aArgs{
beans::PropertyValue(
"CellRangeRepresentation", -1,
- uno::makeAny( sRangeStr ), beans::PropertyState_DIRECT_VALUE ),
+ uno::Any( sRangeStr ), beans::PropertyState_DIRECT_VALUE ),
beans::PropertyValue(
"HasCategories", -1,
- uno::makeAny( bRowHeaders ), beans::PropertyState_DIRECT_VALUE ),
+ uno::Any( bRowHeaders ), beans::PropertyState_DIRECT_VALUE ),
beans::PropertyValue(
"FirstCellAsLabel", -1,
- uno::makeAny( bColumnHeaders ), beans::PropertyState_DIRECT_VALUE ),
+ uno::Any( bColumnHeaders ), beans::PropertyState_DIRECT_VALUE ),
beans::PropertyValue(
"DataRowSource", -1,
- uno::makeAny( chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE )
+ uno::Any( chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE )
};
xReceiver->setArguments( aArgs );
}
@@ -326,7 +326,7 @@ uno::Any SAL_CALL ScChartsObj::getByIndex( sal_Int32 nIndex )
if (!xChart.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xChart);
+ return uno::Any(xChart);
}
uno::Type SAL_CALL ScChartsObj::getElementType()
@@ -348,7 +348,7 @@ uno::Any SAL_CALL ScChartsObj::getByName( const OUString& aName )
if (!xChart.is())
throw container::NoSuchElementException();
- return uno::makeAny(xChart);
+ return uno::Any(xChart);
}
uno::Sequence<OUString> SAL_CALL ScChartsObj::getElementNames()
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 27a3dc4c7917..5c6e82faae35 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -638,7 +638,7 @@ uno::Any SAL_CALL ScSubTotalDescriptorBase::getByIndex( sal_Int32 nIndex )
if (!xField.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xField);
+ return uno::Any(xField);
}
uno::Type SAL_CALL ScSubTotalDescriptorBase::getElementType()
@@ -2245,7 +2245,7 @@ uno::Any SAL_CALL ScDatabaseRangesObj::getByIndex( sal_Int32 nIndex )
if (!xRange.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xRange);
+ return uno::Any(xRange);
}
uno::Type SAL_CALL ScDatabaseRangesObj::getElementType()
@@ -2269,7 +2269,7 @@ uno::Any SAL_CALL ScDatabaseRangesObj::getByName( const OUString& aName )
if (!xRange.is())
throw container::NoSuchElementException();
- return uno::makeAny(xRange);
+ return uno::Any(xRange);
}
uno::Sequence<OUString> SAL_CALL ScDatabaseRangesObj::getElementNames()
@@ -2371,7 +2371,7 @@ uno::Any ScUnnamedDatabaseRangesObj::getByTable( sal_Int32 nTab )
if (!xRange.is())
throw container::NoSuchElementException();
- return uno::makeAny(xRange);
+ return uno::Any(xRange);
}
sal_Bool ScUnnamedDatabaseRangesObj::hasByTable( sal_Int32 nTab )
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 0f822195364d..6141039d1a06 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -2627,7 +2627,7 @@ uno::Reference< container::XIndexAccess > SAL_CALL ScModelObj::getViewData( )
comphelper::makePropertyValue(SC_POSITIONLEFT, nPosLeft),
comphelper::makePropertyValue(SC_POSITIONTOP, nPosTop)
};
- xCont->insertByIndex( 0, uno::makeAny( aSeq ) );
+ xCont->insertByIndex( 0, uno::Any( aSeq ) );
}
}
@@ -3586,7 +3586,7 @@ uno::Any SAL_CALL ScDrawPagesObj::getByIndex( sal_Int32 nIndex )
if (!xPage.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xPage);
+ return uno::Any(xPage);
}
uno::Type SAL_CALL ScDrawPagesObj::getElementType()
@@ -3913,7 +3913,7 @@ uno::Any SAL_CALL ScTableSheetsObj::getByIndex( sal_Int32 nIndex )
if (!xSheet.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xSheet);
+ return uno::Any(xSheet);
// return uno::Any();
}
@@ -3939,7 +3939,7 @@ uno::Any SAL_CALL ScTableSheetsObj::getByName( const OUString& aName )
if (!xSheet.is())
throw container::NoSuchElementException();
- return uno::makeAny(xSheet);
+ return uno::Any(xSheet);
}
uno::Sequence<OUString> SAL_CALL ScTableSheetsObj::getElementNames()
@@ -4085,7 +4085,7 @@ uno::Any SAL_CALL ScTableColumnsObj::getByIndex( sal_Int32 nIndex )
if (!xColumn.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xColumn);
+ return uno::Any(xColumn);
}
@@ -4108,7 +4108,7 @@ uno::Any SAL_CALL ScTableColumnsObj::getByName( const OUString& aName )
if (!xColumn.is())
throw container::NoSuchElementException();
- return uno::makeAny(xColumn);
+ return uno::Any(xColumn);
}
uno::Sequence<OUString> SAL_CALL ScTableColumnsObj::getElementNames()
@@ -4329,7 +4329,7 @@ uno::Any SAL_CALL ScTableRowsObj::getByIndex( sal_Int32 nIndex )
if (!xRow.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xRow);
+ return uno::Any(xRow);
}
uno::Type SAL_CALL ScTableRowsObj::getElementType()
@@ -4640,7 +4640,7 @@ uno::Any SAL_CALL ScAnnotationsObj::getByIndex( sal_Int32 nIndex )
if (!xAnnotation.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xAnnotation);
+ return uno::Any(xAnnotation);
}
uno::Type SAL_CALL ScAnnotationsObj::getElementType()
@@ -4795,7 +4795,7 @@ uno::Any SAL_CALL ScScenariosObj::getByIndex( sal_Int32 nIndex )
if (!xScen.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xScen);
+ return uno::Any(xScen);
}
uno::Type SAL_CALL ScScenariosObj::getElementType()
@@ -4817,7 +4817,7 @@ uno::Any SAL_CALL ScScenariosObj::getByName( const OUString& aName )
if (!xScen.is())
throw container::NoSuchElementException();
- return uno::makeAny(xScen);
+ return uno::Any(xScen);
}
uno::Sequence<OUString> SAL_CALL ScScenariosObj::getElementNames()
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index d3b64cac7df3..b7ad6b63a4e8 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -355,7 +355,7 @@ uno::Any SAL_CALL ScCellFieldsObj::getByIndex( sal_Int32 nIndex )
if (!xField.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xField);
+ return uno::Any(xField);
}
uno::Type SAL_CALL ScCellFieldsObj::getElementType()
@@ -506,7 +506,7 @@ uno::Any SAL_CALL ScHeaderFieldsObj::getByIndex( sal_Int32 nIndex )
if (!xField.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xField);
+ return uno::Any(xField);
}
uno::Type SAL_CALL ScHeaderFieldsObj::getElementType()
@@ -908,10 +908,10 @@ uno::Any ScEditFieldObj::getPropertyValueDateTime(const OUString& rName)
{
SvxDateField* p = static_cast<SvxDateField*>(pField);
if (rName == SC_UNONAME_ISDATE)
- return uno::makeAny(true);
+ return uno::Any(true);
if (rName == SC_UNONAME_ISFIXED)
- return uno::makeAny<sal_Bool>(p->GetType() == SvxDateType::Fix);
+ return uno::Any(p->GetType() == SvxDateType::Fix);
if (rName == SC_UNONAME_DATETIME)
{
@@ -923,39 +923,39 @@ uno::Any ScEditFieldObj::getPropertyValueDateTime(const OUString& rName)
maDateTime.Minutes = 0;
maDateTime.Seconds = 0;
maDateTime.NanoSeconds = 0;
- return uno::makeAny(maDateTime);
+ return uno::Any(maDateTime);
}
if (rName == SC_UNONAME_NUMFMT)
- return uno::makeAny<sal_Int32>(static_cast<sal_Int32>(p->GetFormat()));
+ return uno::Any(static_cast<sal_Int32>(p->GetFormat()));
}
break;
case text::textfield::Type::TIME:
{
// SvxTimeField doesn't have any attributes.
if (rName == SC_UNONAME_ISDATE)
- return uno::makeAny(false);
+ return uno::Any(false);
if (rName == SC_UNONAME_ISFIXED)
- return uno::makeAny(false);
+ return uno::Any(false);
if (rName == SC_UNONAME_DATETIME)
// This is the best we can do.
- return uno::makeAny(maDateTime);
+ return uno::Any(maDateTime);
if (rName == SC_UNONAME_NUMFMT)
// Same as above.
- return uno::makeAny<sal_Int32>(0);
+ return uno::Any(sal_Int32(0));
}
break;
case text::textfield::Type::EXTENDED_TIME:
{
SvxExtTimeField* p = static_cast<SvxExtTimeField*>(pField);
if (rName == SC_UNONAME_ISDATE)
- return uno::makeAny(false);
+ return uno::Any(false);
if (rName == SC_UNONAME_ISFIXED)
- return uno::makeAny<sal_Bool>(p->GetType() == SvxTimeType::Fix);
+ return uno::Any(p->GetType() == SvxTimeType::Fix);
if (rName == SC_UNONAME_DATETIME)
{
@@ -967,11 +967,11 @@ uno::Any ScEditFieldObj::getPropertyValueDateTime(const OUString& rName)
maDateTime.Minutes = aT.GetMin();
maDateTime.Seconds = aT.GetSec();
maDateTime.NanoSeconds = aT.GetNanoSec();
- return uno::makeAny(maDateTime);
+ return uno::Any(maDateTime);
}
if (rName == SC_UNONAME_NUMFMT)
- return uno::makeAny<sal_Int32>(static_cast<sal_Int32>(p->GetFormat()));
+ return uno::Any(static_cast<sal_Int32>(p->GetFormat()));
}
break;
default:
@@ -981,16 +981,16 @@ uno::Any ScEditFieldObj::getPropertyValueDateTime(const OUString& rName)
else
{
if (rName == SC_UNONAME_ISDATE)
- return uno::makeAny<sal_Bool>(mbIsDate);
+ return uno::Any(mbIsDate);
if (rName == SC_UNONAME_ISFIXED)
- return uno::makeAny<sal_Bool>(mbIsFixed);
+ return uno::Any(mbIsFixed);
if (rName == SC_UNONAME_DATETIME)
- return uno::makeAny(maDateTime);
+ return uno::Any(maDateTime);
if (rName == SC_UNONAME_NUMFMT)
- return uno::makeAny(mnNumFormat);
+ return uno::Any(mnNumFormat);
}
throw beans::UnknownPropertyException(rName);
@@ -1218,10 +1218,10 @@ uno::Any SAL_CALL ScEditFieldObj::getPropertyValue( const OUString& aPropertyNam
{
SolarMutexGuard aGuard;
if (aPropertyName == SC_UNONAME_TEXTFIELD_TYPE)
- return uno::makeAny(meType);
+ return uno::Any(meType);
if (aPropertyName == SC_UNONAME_ANCHOR)
- return uno::makeAny(mpContent);
+ return uno::Any(mpContent);
if (aPropertyName == SC_UNONAME_ANCTYPE)
{
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index e23af3503b20..6e815b2f8646 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -377,7 +377,7 @@ uno::Any SAL_CALL ScTableConditionalFormat::getByIndex( sal_Int32 nIndex )
if (!xEntry.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xEntry);
+ return uno::Any(xEntry);
}
uno::Type SAL_CALL ScTableConditionalFormat::getElementType()
@@ -417,7 +417,7 @@ uno::Any SAL_CALL ScTableConditionalFormat::getByName( const OUString& aName )
if (!xEntry.is())
throw container::NoSuchElementException();
- return uno::makeAny(xEntry);
+ return uno::Any(xEntry);
}
uno::Sequence<OUString> SAL_CALL ScTableConditionalFormat::getElementNames()
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 8e7be93c5baf..61b095abeab2 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -472,7 +472,7 @@ uno::Any SAL_CALL ScSheetLinksObj::getByIndex( sal_Int32 nIndex )
if (!xLink.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xLink);
+ return uno::Any(xLink);
}
uno::Type SAL_CALL ScSheetLinksObj::getElementType()
@@ -494,7 +494,7 @@ uno::Any SAL_CALL ScSheetLinksObj::getByName( const OUString& aName )
if (!xLink.is())
throw container::NoSuchElementException();
- return uno::makeAny(xLink);
+ return uno::Any(xLink);
}
sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const OUString& aName )
@@ -973,7 +973,7 @@ uno::Any SAL_CALL ScAreaLinksObj::getByIndex( sal_Int32 nIndex )
if (!xLink.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xLink);
+ return uno::Any(xLink);
}
@@ -1263,7 +1263,7 @@ uno::Any SAL_CALL ScDDELinksObj::getByIndex( sal_Int32 nIndex )
if (!xLink.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xLink);
+ return uno::Any(xLink);
}
uno::Type SAL_CALL ScDDELinksObj::getElementType()
@@ -1285,7 +1285,7 @@ uno::Any SAL_CALL ScDDELinksObj::getByName( const OUString& aName )
if (!xLink.is())
throw container::NoSuchElementException();
- return uno::makeAny(xLink);
+ return uno::Any(xLink);
}
uno::Sequence<OUString> SAL_CALL ScDDELinksObj::getElementNames()
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 05cd82fa91a4..9a286bb6d41b 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -608,7 +608,7 @@ uno::Any SAL_CALL ScNamedRangesObj::getByIndex( sal_Int32 nIndex )
if ( !xRange.is() )
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xRange);
+ return uno::Any(xRange);
}
uno::Type SAL_CALL ScNamedRangesObj::getElementType()
@@ -659,7 +659,7 @@ uno::Any SAL_CALL ScNamedRangesObj::getByName( const OUString& aName )
if ( !xRange.is() )
throw container::NoSuchElementException();
- return uno::makeAny(xRange);
+ return uno::Any(xRange);
}
uno::Sequence<OUString> SAL_CALL ScNamedRangesObj::getElementNames()
@@ -1143,7 +1143,7 @@ uno::Any SAL_CALL ScLabelRangesObj::getByIndex( sal_Int32 nIndex )
if ( !xRange.is() )
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xRange);
+ return uno::Any(xRange);
}
uno::Type SAL_CALL ScLabelRangesObj::getElementType()
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index b03f8dc0788b..01a7e90d63d8 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -485,7 +485,7 @@ uno::Any SAL_CALL ScStyleFamiliesObj::getByIndex( sal_Int32 nIndex )
if (!xFamily.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xFamily);
+ return uno::Any(xFamily);
}
uno::Type SAL_CALL ScStyleFamiliesObj::getElementType()
@@ -509,7 +509,7 @@ uno::Any SAL_CALL ScStyleFamiliesObj::getByName( const OUString& aName )
if (!xFamily.is())
throw container::NoSuchElementException();
- return uno::makeAny(xFamily);
+ return uno::Any(xFamily);
}
uno::Sequence<OUString> SAL_CALL ScStyleFamiliesObj::getElementNames()
@@ -801,7 +801,7 @@ uno::Any SAL_CALL ScStyleFamilyObj::getByIndex( sal_Int32 nIndex )
if (!xObj.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xObj);
+ return uno::Any(xObj);
}
uno::Type SAL_CALL ScStyleFamilyObj::getElementType()
@@ -826,7 +826,7 @@ uno::Any SAL_CALL ScStyleFamilyObj::getByName( const OUString& aName )
if (!xObj.is())
throw container::NoSuchElementException();
- return uno::makeAny(xObj);
+ return uno::Any(xObj);
}
uno::Sequence<OUString> SAL_CALL ScStyleFamilyObj::getElementNames()
diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx
index 9d3ca299872b..d14c1090f31e 100644
--- a/sc/source/ui/unoobj/targuno.cxx
+++ b/sc/source/ui/unoobj/targuno.cxx
@@ -97,7 +97,7 @@ uno::Any SAL_CALL ScLinkTargetTypesObj::getByName(const OUString& aName)
{
for (sal_uInt16 i=0; i<SC_LINKTARGETTYPE_COUNT; i++)
if ( aNames[i] == aName )
- return uno::makeAny(uno::Reference< beans::XPropertySet >(new ScLinkTargetTypeObj( pDocShell, i )));
+ return uno::Any(uno::Reference< beans::XPropertySet >(new ScLinkTargetTypeObj( pDocShell, i )));
}
throw container::NoSuchElementException();
@@ -264,7 +264,7 @@ uno::Any SAL_CALL ScLinkTargetsObj::getByName(const OUString& aName)
{
uno::Reference<beans::XPropertySet> xProp(xCollection->getByName(aName), uno::UNO_QUERY);
if (xProp.is())
- return uno::makeAny(xProp);
+ return uno::Any(xProp);
throw container::NoSuchElementException();
}
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 4fe5b0c1f7d9..37fef30cf520 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -859,7 +859,7 @@ uno::Any SAL_CALL ScTabViewObj::getSelection()
// is something selected in drawing layer?
uno::Reference<uno::XInterface> xRet(pViewSh->getSelectedXShapes());
if (xRet.is())
- return uno::makeAny(xRet);
+ return uno::Any(xRet);
// otherwise sheet (cell) selection
@@ -927,7 +927,7 @@ uno::Any SAL_CALL ScTabViewObj::getSelection()
}
}
- return uno::makeAny(uno::Reference<uno::XInterface>(static_cast<cppu::OWeakObject*>(pObj.get())));
+ return uno::Any(uno::Reference<uno::XInterface>(static_cast<cppu::OWeakObject*>(pObj.get())));
}
// XEnumerationAccess
@@ -964,7 +964,7 @@ uno::Any SAL_CALL ScTabViewObj::getByIndex( sal_Int32 nIndex )
if (!xPane.is())
throw lang::IndexOutOfBoundsException();
- return uno::makeAny(xPane);
+ return uno::Any(xPane);
}
uno::Type SAL_CALL ScTabViewObj::getElementType()
generated by cgit (git 2.34.1) at 2025-01-25 05:36:52 +0000