strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cid#1607542 COPY_INSTEAD_OF_MOVE

Browse source 
and

cid#1606986 COPY_INSTEAD_OF_MOVE
cid#1557969 COPY_INSTEAD_OF_MOVE
cid#1557837 COPY_INSTEAD_OF_MOVE
cid#1557772 COPY_INSTEAD_OF_MOVE
cid#1557735 COPY_INSTEAD_OF_MOVE
cid#1557672 COPY_INSTEAD_OF_MOVE
cid#1557664 COPY_INSTEAD_OF_MOVE
cid#1557650 COPY_INSTEAD_OF_MOVE
cid#1557642 COPY_INSTEAD_OF_MOVE
cid#1557639 COPY_INSTEAD_OF_MOVE
cid#1557628 COPY_INSTEAD_OF_MOVE
cid#1557623 COPY_INSTEAD_OF_MOVE
cid#1557581 COPY_INSTEAD_OF_MOVE
cid#1557489 COPY_INSTEAD_OF_MOVE
cid#1557473 COPY_INSTEAD_OF_MOVE
cid#1557317 COPY_INSTEAD_OF_MOVE
cid#1557261 COPY_INSTEAD_OF_MOVE
cid#1557146 COPY_INSTEAD_OF_MOVE
cid#1557135 COPY_INSTEAD_OF_MOVE
cid#1557134 COPY_INSTEAD_OF_MOVE
cid#1557079 COPY_INSTEAD_OF_MOVE
cid#1557063 COPY_INSTEAD_OF_MOVE
cid#1557052 COPY_INSTEAD_OF_MOVE
cid#1556982 COPY_INSTEAD_OF_MOVE
cid#1556977 COPY_INSTEAD_OF_MOVE
cid#1556950 COPY_INSTEAD_OF_MOVE
cid#1556943 COPY_INSTEAD_OF_MOVE
cid#1556804 COPY_INSTEAD_OF_MOVE
cid#1556736 COPY_INSTEAD_OF_MOVE
cid#1556658 COPY_INSTEAD_OF_MOVE
cid#1556621 COPY_INSTEAD_OF_MOVE
cid#1556590 COPY_INSTEAD_OF_MOVE
cid#1556579 COPY_INSTEAD_OF_MOVE
cid#1556534 COPY_INSTEAD_OF_MOVE
cid#1556524 COPY_INSTEAD_OF_MOVE
cid#1556478 COPY_INSTEAD_OF_MOVE
cid#1556467 COPY_INSTEAD_OF_MOVE
cid#1556422 COPY_INSTEAD_OF_MOVE
cid#1556314 COPY_INSTEAD_OF_MOVE
cid#1556309 COPY_INSTEAD_OF_MOVE
cid#1556258 COPY_INSTEAD_OF_MOVE
cid#1556143 COPY_INSTEAD_OF_MOVE
cid#1556119 COPY_INSTEAD_OF_MOVE
cid#1556101 COPY_INSTEAD_OF_MOVE
cid#1556097 COPY_INSTEAD_OF_MOVE
cid#1556039 COPY_INSTEAD_OF_MOVE
cid#1555966 COPY_INSTEAD_OF_MOVE
cid#1555948 COPY_INSTEAD_OF_MOVE
cid#1555915 COPY_INSTEAD_OF_MOVE
cid#1555836 COPY_INSTEAD_OF_MOVE
cid#1555748 COPY_INSTEAD_OF_MOVE
cid#1555644 COPY_INSTEAD_OF_MOVE
cid#1555582 COPY_INSTEAD_OF_MOVE
cid#1555478 COPY_INSTEAD_OF_MOVE
cid#1555475 COPY_INSTEAD_OF_MOVE
cid#1555409 COPY_INSTEAD_OF_MOVE
cid#1555372 COPY_INSTEAD_OF_MOVE
cid#1555334 COPY_INSTEAD_OF_MOVE
cid#1555330 COPY_INSTEAD_OF_MOVE
cid#1555310 COPY_INSTEAD_OF_MOVE
cid#1555257 COPY_INSTEAD_OF_MOVE
cid#1555247 COPY_INSTEAD_OF_MOVE
cid#1555147 COPY_INSTEAD_OF_MOVE
cid#1555120 COPY_INSTEAD_OF_MOVE
cid#1555059 COPY_INSTEAD_OF_MOVE
cid#1555016 COPY_INSTEAD_OF_MOVE
cid#1554880 COPY_INSTEAD_OF_MOVE
cid#1554824 COPY_INSTEAD_OF_MOVE
cid#1554808 COPY_INSTEAD_OF_MOVE
cid#1546189 COPY_INSTEAD_OF_MOVE

Change-Id: I2d2f33c603f1596228c9ecb169472ba6751e7826
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177593
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Caolán McNamara 2024-11-30 19:37:10 +00:00
parent 096a1f0a6f
commit 8c1dbd3188
62 changed files with 91 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
basic/source/runtime/runtime.cxx
View file

@ -4062,7 +4062,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
Any aUnoAny = pUnoObj->getUnoAny(); Any aUnoAny = pUnoObj->getUnoAny();
if( aUnoAny.getValueTypeClass() == TypeClass_INTERFACE ) if( aUnoAny.getValueTypeClass() == TypeClass_INTERFACE )
x = aUnoAny; x = std::move(aUnoAny);
pElem = pDflt; pElem = pDflt;
} }
} }

2
chart2/source/view/main/PropertyMapper.cxx
View file

@ -113,7 +113,7 @@ void PropertyMapper::setMappedProperties(
{ {
//do not set empty anys because of performance (otherwise SdrAttrObj::ItemChange will take much longer) //do not set empty anys because of performance (otherwise SdrAttrObj::ItemChange will take much longer)
pNames[nN] = rTarget; pNames[nN] = rTarget;
pValues[nN] = aAny; pValues[nN] = std::move(aAny);
++nN; ++nN;
} }
} }

4
comphelper/source/property/propertycontainerhelper.cxx
View file

@ -251,7 +251,7 @@ bool OPropertyContainerHelper::convertFastPropertyValue(
{ {
// we were able to query the given XInterface-derivee for the interface // we were able to query the given XInterface-derivee for the interface
// which is required for this property // which is required for this property
aNewRequestedValue = aProperlyTyped; aNewRequestedValue = std::move(aProperlyTyped);
} }
} }
@ -292,7 +292,7 @@ bool OPropertyContainerHelper::convertFastPropertyValue(
if (bModified) if (bModified)
{ {
_rOldValue = *pPropContainer; _rOldValue = *pPropContainer;
_rConvertedValue = aNewRequestedValue; _rConvertedValue = std::move(aNewRequestedValue);
} }
} }
break; break;

4
connectivity/source/commontools/dbexception.cxx
View file

@ -229,10 +229,10 @@ void SQLExceptionInfo::append( TYPE _eType, const OUString& _rErrorMessage, cons
// append // append
if (pLastException) if (pLastException)
pLastException->NextException = aAppend; pLastException->NextException = std::move(aAppend);
else else
{ {
m_aContent = aAppend; m_aContent = std::move(aAppend);
m_eType = _eType; m_eType = _eType;
} }
} }

2
dbaccess/source/core/api/statement.cxx
View file

@ -230,7 +230,7 @@ sal_Bool OStatementBase::convertFastPropertyValue(Any & rConvertedValue, Any & r
Any aCurrentValue = m_xAggregateAsSet->getPropertyValue( sPropName ); Any aCurrentValue = m_xAggregateAsSet->getPropertyValue( sPropName );
if ( aCurrentValue != rValue ) if ( aCurrentValue != rValue )
{ {
rOldValue = aCurrentValue; rOldValue = std::move(aCurrentValue);
rConvertedValue = rValue; rConvertedValue = rValue;
bModified = true; bModified = true;
} }

2
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
View file

@ -143,7 +143,7 @@ void OXMLDataSourceSetting::addValue(const OUString& _sValue)
{ {
sal_Int32 nPos = m_aInfoSequence.getLength(); sal_Int32 nPos = m_aInfoSequence.getLength();
m_aInfoSequence.realloc(nPos+1); m_aInfoSequence.realloc(nPos+1);
m_aInfoSequence.getArray()[nPos] = aValue; m_aInfoSequence.getArray()[nPos] = std::move(aValue);
} }
} }

2
dbaccess/source/filter/xml/xmlExport.cxx
View file

@ -1223,7 +1223,7 @@ void ODBExport::GetConfigurationSettings(Sequence<PropertyValue>& aProps)
aProps.realloc(nLength + 1); aProps.realloc(nLength + 1);
auto pProps = aProps.getArray(); auto pProps = aProps.getArray();
pProps[nLength].Name = "layout-settings"; pProps[nLength].Name = "layout-settings";
pProps[nLength].Value = aValue; pProps[nLength].Value = std::move(aValue);
} }
} }
catch(const Exception&) catch(const Exception&)

4
desktop/source/deployment/manager/dp_commandenvironments.cxx
View file

@ -224,11 +224,11 @@ void SilentCheckPrerequisitesCommandEnv::handle(
else if ((request >>= platformExc) else if ((request >>= platformExc)
|| (request >>= depExc)) || (request >>= depExc))
{ {
m_Exception = request; m_Exception = std::move(request);
} }
else else
{ {
m_UnknownException = request; m_UnknownException = std::move(request);
} }
} }

2
extensions/source/propctrlr/formcomponenthandler.cxx
View file

@ -358,7 +358,7 @@ namespace pcr
OUString aValueStr; OUString aValueStr;
_rValue >>= aValueStr; _rValue >>= aValueStr;
xStringResourceManager->setString( aPureIdStr, aValueStr ); xStringResourceManager->setString( aPureIdStr, aValueStr );
aValue = aPropertyValue; // set value to force modified aValue = std::move(aPropertyValue); // set value to force modified
} }
} }
// StringItemList? // StringItemList?

2
forms/source/component/ComboBox.cxx
View file

@ -746,7 +746,7 @@ bool OComboBoxModel::commitControlValueToDbColumn( bool _bPostReset )
} }
} }
m_aLastKnownValue = aNewValue; m_aLastKnownValue = std::move(aNewValue);
} }
// add the new value to the list // add the new value to the list

2
forms/source/component/Currency.cxx
View file

@ -197,7 +197,7 @@ bool OCurrencyModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
return false; return false;
} }
} }
m_aSaveValue = aControlValue; m_aSaveValue = std::move(aControlValue);
} }
return true; return true;
} }

2
forms/source/component/Date.cxx
View file

@ -250,7 +250,7 @@ bool ODateModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
return false; return false;
} }
} }
m_aSaveValue = aControlValue; m_aSaveValue = std::move(aControlValue);
return true; return true;
} }

2
forms/source/component/FormattedField.cxx
View file

@ -835,7 +835,7 @@ bool OFormattedModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
return false; return false;
} }
} }
m_aSaveValue = aControlValue; m_aSaveValue = std::move(aControlValue);
return true; return true;
} }

8
forms/source/component/ListBox.cxx
View file

@ -428,10 +428,10 @@ namespace frm
case PROPERTY_ID_SELECT_VALUE : case PROPERTY_ID_SELECT_VALUE :
{ {
// Any from connectivity::ORowSetValue // Any from connectivity::ORowSetValue
Any _rCurrentValue = getCurrentSingleValue(); Any aCurrentValue = getCurrentSingleValue();
if (_rCurrentValue != _rValue) if (aCurrentValue != _rValue)
{ {
_rOldValue = _rCurrentValue; _rOldValue = std::move(aCurrentValue);
_rConvertedValue = _rValue; _rConvertedValue = _rValue;
bModified = true; bModified = true;
} }
@ -1943,7 +1943,7 @@ namespace frm
if (bModified) if (bModified)
{ {
m_aCurrentSelection = aValue; m_aCurrentSelection = std::move(aValue);
m_aChangeIdle.Start(); m_aChangeIdle.Start();
} }
} }

2
forms/source/component/Numeric.cxx
View file

@ -146,7 +146,7 @@ bool ONumericModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
return false; return false;
} }
} }
m_aSaveValue = aControlValue; m_aSaveValue = std::move(aControlValue);
} }
return true; return true;
} }

2
forms/source/component/Pattern.cxx
View file

@ -152,7 +152,7 @@ bool OPatternModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
return false; return false;
} }
m_aLastKnownValue = aNewValue; m_aLastKnownValue = std::move(aNewValue);
return true; return true;
} }

2
forms/source/component/Time.cxx
View file

@ -258,7 +258,7 @@ bool OTimeModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
return false; return false;
} }
} }
m_aSaveValue = aControlValue; m_aSaveValue = std::move(aControlValue);
return true; return true;
} }

2
forms/source/misc/InterfaceContainer.cxx
View file

@ -749,7 +749,7 @@ void OInterfaceContainer::approveNewElement( const Reference< XPropertySet >& _r
{ {
_pElement->xPropertySet = _rxObject; _pElement->xPropertySet = _rxObject;
_pElement->xChild = std::move(xChild); _pElement->xChild = std::move(xChild);
_pElement->aElementTypeInterface = aCorrectType; _pElement->aElementTypeInterface = std::move(aCorrectType);
_pElement->xInterface = Reference< XInterface >( _rxObject, UNO_QUERY ); // normalized XInterface _pElement->xInterface = Reference< XInterface >( _rxObject, UNO_QUERY ); // normalized XInterface
} }
} }

10
framework/source/services/frame.cxx
View file

@ -1864,7 +1864,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL XFrameImpl::getProp
} }
void SAL_CALL XFrameImpl::setPropertyValue(const OUString& sProperty, void SAL_CALL XFrameImpl::setPropertyValue(const OUString& sProperty,
const css::uno::Any& aValue ) const css::uno::Any& rValue)
{ {
// TODO look for e.g. readonly props and reject setProp() call! // TODO look for e.g. readonly props and reject setProp() call!
@ -1881,7 +1881,7 @@ void SAL_CALL XFrameImpl::setPropertyValue(const OUString& sProperty,
css::uno::Any aCurrentValue = impl_getPropertyValue(aPropInfo.Handle); css::uno::Any aCurrentValue = impl_getPropertyValue(aPropInfo.Handle);
bool bWillBeChanged = (aCurrentValue != aValue); bool bWillBeChanged = (aCurrentValue != rValue);
if (! bWillBeChanged) if (! bWillBeChanged)
return; return;
@ -1889,14 +1889,14 @@ void SAL_CALL XFrameImpl::setPropertyValue(const OUString& sProperty,
aEvent.PropertyName = aPropInfo.Name; aEvent.PropertyName = aPropInfo.Name;
aEvent.Further = false; aEvent.Further = false;
aEvent.PropertyHandle = aPropInfo.Handle; aEvent.PropertyHandle = aPropInfo.Handle;
aEvent.OldValue = aCurrentValue; aEvent.OldValue = std::move(aCurrentValue);
aEvent.NewValue = aValue; aEvent.NewValue = rValue;
aEvent.Source = m_xBroadcaster; aEvent.Source = m_xBroadcaster;
if (impl_existsVeto(aEvent)) if (impl_existsVeto(aEvent))
throw css::beans::PropertyVetoException(); throw css::beans::PropertyVetoException();
impl_setPropertyValue(aPropInfo.Handle, aValue); impl_setPropertyValue(aPropInfo.Handle, rValue);
impl_notifyChangeListener(aEvent); impl_notifyChangeListener(aEvent);
} }

2
framework/source/uiconfiguration/globalsettings.cxx
View file

@ -175,7 +175,7 @@ bool GlobalSettings_Access::GetToolbarStateInfo( GlobalSettings::StateInfo eStat
else if ( eStateInfo == GlobalSettings::STATEINFO_DOCKED ) else if ( eStateInfo == GlobalSettings::STATEINFO_DOCKED )
a = xNameAccess->getByName( m_aPropDocked ); a = xNameAccess->getByName( m_aPropDocked );
aValue = a; aValue = std::move(a);
return true; return true;
} }
} }

2
framework/source/uiconfiguration/windowstateconfiguration.cxx
View file

@ -740,7 +740,7 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const OU
// put value into the return sequence // put value into the return sequence
PropertyValue pv; PropertyValue pv;
pv.Name = m_aPropArray[i]; pv.Name = m_aPropArray[i];
pv.Value = a; pv.Value = std::move(a);
aPropVec.push_back(pv); aPropVec.push_back(pv);
} }
} }

2
linguistic/source/lngsvcmgr.cxx
View file

@ -1617,7 +1617,7 @@ bool LngSvcMgr::SaveCfgSvcs( std::u16string_view rServiceName )
DBG_ASSERT( aCfgAny.hasValue(), "missing value for 'Any' type" ); DBG_ASSERT( aCfgAny.hasValue(), "missing value for 'Any' type" );
OUString aCfgLocaleStr( LanguageTag::convertToBcp47( rLocale)); OUString aCfgLocaleStr( LanguageTag::convertToBcp47( rLocale));
pValue->Value = aCfgAny; pValue->Value = std::move(aCfgAny);
pValue->Name = aNodeName + "/" + aCfgLocaleStr; pValue->Name = aNodeName + "/" + aCfgLocaleStr;
pValue++; pValue++;
} }

8
oox/source/ppt/animationspersist.cxx
View file

@ -141,7 +141,6 @@ namespace oox::ppt {
if( maShapeTarget.mnType == XML_dgm ) if( maShapeTarget.mnType == XML_dgm )
sShapeName = maShapeTarget.msSubShapeId; sShapeName = maShapeTarget.msSubShapeId;
Any rTarget;
::oox::drawingml::ShapePtr pShape = pSlide->getShape( sShapeName ); ::oox::drawingml::ShapePtr pShape = pSlide->getShape( sShapeName );
SAL_WARN_IF( !pShape, "oox.ppt", "failed to locate Shape" ); SAL_WARN_IF( !pShape, "oox.ppt", "failed to locate Shape" );
@ -156,9 +155,10 @@ namespace oox::ppt {
SAL_WARN_IF( !xShape.is(), "oox.ppt", "fail to get XShape from shape" ); SAL_WARN_IF( !xShape.is(), "oox.ppt", "fail to get XShape from shape" );
if( xShape.is() ) if( xShape.is() )
{ {
rTarget <<= xShape; Any aTmpTarget;
maShapeTarget.convert(rTarget, nSubType); aTmpTarget <<= xShape;
aTarget = rTarget; maShapeTarget.convert(aTmpTarget, nSubType);
aTarget = std::move(aTmpTarget);
} }
} }
break; break;

4
reportdesign/source/filter/xml/xmlControlProperty.cxx
View file

@ -162,12 +162,12 @@ void OXMLControlProperty::addValue(const OUString& _sValue)
aValue = convertString(m_aPropType, _sValue); aValue = convertString(m_aPropType, _sValue);
if ( !m_bIsList ) if ( !m_bIsList )
m_aSetting.Value = aValue; m_aSetting.Value = std::move(aValue);
else else
{ {
sal_Int32 nPos = m_aSequence.getLength(); sal_Int32 nPos = m_aSequence.getLength();
m_aSequence.realloc(nPos+1); m_aSequence.realloc(nPos+1);
m_aSequence.getArray()[nPos] = aValue; m_aSequence.getArray()[nPos] = std::move(aValue);
} }
} }

2
reportdesign/source/ui/inspection/GeometryHandler.cxx
View file

@ -371,7 +371,7 @@ uno::Any SAL_CALL GeometryHandler::getPropertyValue(const OUString & PropertyNam
break; break;
case USER_DEF_FUNCTION: case USER_DEF_FUNCTION:
if ( !sDataField.isEmpty() && PROPERTY_ID_FORMULALIST == nId ) if ( !sDataField.isEmpty() && PROPERTY_ID_FORMULALIST == nId )
aPropertyValue = aDataField; aPropertyValue = std::move(aDataField);
break; break;
case COUNTER: case COUNTER:
if ( PROPERTY_ID_SCOPE == nId && impl_isCounterFunction_throw(sDataField,m_sScope) ) if ( PROPERTY_ID_SCOPE == nId && impl_isCounterFunction_throw(sDataField,m_sScope) )

4
reportdesign/source/ui/report/ReportController.cxx
View file

@ -4072,7 +4072,7 @@ void OReportController::impl_fillState_nothrow(const OUString& _sProperty,dbaui:
uno::Any aTemp2 = xProp->getPropertyValue(_sProperty); uno::Any aTemp2 = xProp->getPropertyValue(_sProperty);
if ( aIter == aSelection.begin() ) if ( aIter == aSelection.begin() )
{ {
aTemp = aTemp2; aTemp = std::move(aTemp2);
} }
else if ( aTemp != aTemp2 ) else if ( aTemp != aTemp2 )
break; break;
@ -4083,7 +4083,7 @@ void OReportController::impl_fillState_nothrow(const OUString& _sProperty,dbaui:
} }
} }
if ( aIter == aSelection.end() ) if ( aIter == aSelection.end() )
_rState.aValue = aTemp; _rState.aValue = std::move(aTemp);
} }
void OReportController::impl_zoom_nothrow() void OReportController::impl_zoom_nothrow()

4
sc/source/core/data/dpfilteredcache.cxx
View file

@ -307,9 +307,7 @@ void ScDPFilteredCache::filterTable(const vector<Criterion>& rCriteria, Sequence
for (SCCOL nCol = 0; nCol < nColSize; ++nCol) for (SCCOL nCol = 0; nCol < nColSize; ++nCol)
{ {
OUString str = getFieldName( nCol); OUString str = getFieldName( nCol);
Any any; pRow[nCol] <<= str;
any <<= str;
pRow[nCol] = any;
} }
tableData.push_back(headerRow); tableData.push_back(headerRow);

2
sc/source/core/tool/addincol.cxx
View file

@ -1497,7 +1497,7 @@ void ScUnoAddInCall::ExecuteCall()
uno::Any* pDest = aRealArgs.getArray(); uno::Any* pDest = aRealArgs.getArray();
pDest = std::copy_n(std::cbegin(aArgs), nCallPos, pDest); pDest = std::copy_n(std::cbegin(aArgs), nCallPos, pDest);
*pDest = aCallerAny; *pDest = std::move(aCallerAny);
std::copy(std::next(std::cbegin(aArgs), nCallPos), std::cend(aArgs), std::next(pDest)); std::copy(std::next(std::cbegin(aArgs), nCallPos), std::cend(aArgs), std::next(pDest));
ExecuteCallWithArgs( aRealArgs ); ExecuteCallWithArgs( aRealArgs );

2
sc/source/ui/view/viewfunc.cxx
View file

@ -1495,7 +1495,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, bool bCursor
aProperties.realloc( nCount + 1 ); aProperties.realloc( nCount + 1 );
auto pProperties = aProperties.getArray(); auto pProperties = aProperties.getArray();
pProperties[ nCount ].Name = pEntry->aName; pProperties[ nCount ].Name = pEntry->aName;
pProperties[ nCount ].Value = aVal; pProperties[ nCount ].Value = std::move(aVal);
++nCount; ++nCount;
} }
} }

4
scripting/source/dlgprov/dlgevtatt.cxx
View file

@ -584,7 +584,7 @@ namespace dlgprov
Reference< XWindow > xWindow( m_xControl, UNO_QUERY ); Reference< XWindow > xWindow( m_xControl, UNO_QUERY );
pArgs[0] <<= xWindow; pArgs[0] <<= xWindow;
} }
pArgs[1] = aEventObject; pArgs[1] = std::move(aEventObject);
aRet = xMethod->invoke( aHandlerObject, Args ); aRet = xMethod->invoke( aHandlerObject, Args );
bHandled = true; bHandled = true;
} }
@ -598,7 +598,7 @@ namespace dlgprov
if( bHandled ) if( bHandled )
{ {
if( pRet ) if( pRet )
*pRet = aRet; *pRet = std::move(aRet);
} }
else else
{ {

2
scripting/source/protocolhandler/scripthandler.cxx
View file

@ -264,7 +264,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
css::frame::DispatchResultEvent aEvent; css::frame::DispatchResultEvent aEvent;
aEvent.Source = getXWeak(); aEvent.Source = getXWeak();
aEvent.Result = invokeResult; aEvent.Result = std::move(invokeResult);
aEvent.State = aState; aEvent.State = aState;
try try

2
scripting/source/vbaevents/eventhelper.cxx
View file

@ -475,7 +475,7 @@ ReadOnlyEventsNameContainer::ReadOnlyEventsNameContainer( const Sequence< OUStri
if ( eventMethodToDescriptor( rSrc, evtDesc, sCodeName ) ) if ( eventMethodToDescriptor( rSrc, evtDesc, sCodeName ) )
{ {
aDesc <<= evtDesc; aDesc <<= evtDesc;
m_hEvents[ rSrc ] = aDesc; m_hEvents[ rSrc ] = std::move(aDesc);
} }
} }
} }

4
sd/source/filter/ppt/pptinanimations.cxx
View file

@ -2162,7 +2162,7 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen
if (importAttributeValue(pValue, aValue2) && aFormula.isEmpty()) if (importAttributeValue(pValue, aValue2) && aFormula.isEmpty())
aValue2 >>= aFormula; aValue2 >>= aFormula;
} }
aValuesRange[nKeyTime] = aValue1; aValuesRange[nKeyTime] = std::move(aValue1);
} }
} }
} }
@ -2599,7 +2599,7 @@ void AnimationImporter::importPropertySetContainer( const Atom* pAtom, PropertyS
{ {
Any aAny; Any aAny;
(void)importAttributeValue( pChildAtom, aAny ); (void)importAttributeValue( pChildAtom, aAny );
rSet.maProperties[ pChildAtom->getInstance() ] = aAny; rSet.maProperties[ pChildAtom->getInstance() ] = std::move(aAny);
} }
else else
{ {

6
sd/source/ui/slideshow/slideshowimpl.cxx
View file

@ -2905,12 +2905,10 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen )
try try
{ {
// For Pencolor; // For Pencolor;
Any aValue;
if( mbUsePen )
aValue <<= mnUserPaintColor;
beans::PropertyValue aPenProp; beans::PropertyValue aPenProp;
aPenProp.Name = "UserPaintColor"; aPenProp.Name = "UserPaintColor";
aPenProp.Value = aValue; if( mbUsePen )
aPenProp.Value <<= mnUserPaintColor;
mxShow->setProperty( aPenProp ); mxShow->setProperty( aPenProp );
//for StrokeWidth : //for StrokeWidth :

4
sd/source/ui/unoidl/randomnode.cxx
View file

@ -458,7 +458,7 @@ Reference< XEnumeration > SAL_CALL RandomAnimationNode::createEnumeration()
Any aTarget( mxFirstNode->getTarget() ); Any aTarget( mxFirstNode->getTarget() );
if( aTarget.hasValue() ) if( aTarget.hasValue() )
{ {
maTarget = aTarget; maTarget = std::move(aTarget);
mxFirstNode.clear(); mxFirstNode.clear();
} }
} }
@ -523,7 +523,7 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::appendChild( const Ref
{ {
Any aTarget( xAnimate->getTarget() ); Any aTarget( xAnimate->getTarget() );
if( aTarget.hasValue() ) if( aTarget.hasValue() )
maTarget = aTarget; maTarget = std::move(aTarget);
} }
if( !maTarget.hasValue() && !mxFirstNode.is() ) if( !maTarget.hasValue() && !mxFirstNode.is() )

2
sfx2/source/control/dispatch.cxx
View file

@ -2044,7 +2044,7 @@ SfxItemState SfxDispatcher::QueryState( sal_uInt16 nSID, css::uno::Any& rAny )
nSubId |= CONVERT_TWIPS; nSubId |= CONVERT_TWIPS;
aItem.getItem()->QueryValue( aState, static_cast<sal_uInt8>(nSubId) ); aItem.getItem()->QueryValue( aState, static_cast<sal_uInt8>(nSubId) );
} }
rAny = aState; rAny = std::move(aState);
return SfxItemState::DEFAULT; return SfxItemState::DEFAULT;
} }

4
sfx2/source/control/unoctitm.cxx
View file

@ -825,7 +825,7 @@ void SfxDispatchController_Impl::addStatusListener(const css::uno::Reference< cs
if ( bVisible ) if ( bVisible )
{ {
aEvent.IsEnabled = eState != SfxItemState::DISABLED; aEvent.IsEnabled = eState != SfxItemState::DISABLED;
aEvent.State = aState; aEvent.State = std::move(aState);
} }
else else
{ {
@ -915,7 +915,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
aEvent.Source = static_cast<css::frame::XDispatch*>(pDispatch); aEvent.Source = static_cast<css::frame::XDispatch*>(pDispatch);
aEvent.IsEnabled = eState != SfxItemState::DISABLED; aEvent.IsEnabled = eState != SfxItemState::DISABLED;
aEvent.Requery = false; aEvent.Requery = false;
aEvent.State = aState; aEvent.State = std::move(aState);
if (pDispatcher && pDispatcher->GetFrame()) if (pDispatcher && pDispatcher->GetFrame())
{ {

4
sfx2/source/doc/SfxDocumentMetaData.cxx
View file

@ -1783,13 +1783,11 @@ SfxDocumentMetaData::getDocumentStatistics()
css::beans::NamedValue stat; css::beans::NamedValue stat;
stat.Name = OUString::createFromAscii(s_stdStats[i]); stat.Name = OUString::createFromAscii(s_stdStats[i]);
sal_Int32 val; sal_Int32 val;
css::uno::Any any;
if (!::sax::Converter::convertNumber(val, text, 0) || (val < 0)) { if (!::sax::Converter::convertNumber(val, text, 0) || (val < 0)) {
val = 0; val = 0;
SAL_WARN("sfx.doc", "Invalid number: " << text); SAL_WARN("sfx.doc", "Invalid number: " << text);
} }
any <<= val; stat.Value <<= val;
stat.Value = any;
stats.push_back(stat); stats.push_back(stat);
} }

4
stoc/source/security/file_policy.cxx
View file

@ -442,14 +442,14 @@ void FilePolicy::refresh()
Sequence< Any > perms( userPermissions[ userId ] ); Sequence< Any > perms( userPermissions[ userId ] );
sal_Int32 len = perms.getLength(); sal_Int32 len = perms.getLength();
perms.realloc( len +1 ); perms.realloc( len +1 );
perms.getArray()[ len ] = perm; perms.getArray()[ len ] = std::move(perm);
userPermissions[ userId ] = std::move(perms); userPermissions[ userId ] = std::move(perms);
} }
else else
{ {
sal_Int32 len = defaultPermissions.getLength(); sal_Int32 len = defaultPermissions.getLength();
defaultPermissions.realloc( len +1 ); defaultPermissions.realloc( len +1 );
defaultPermissions.getArray()[ len ] = perm; defaultPermissions.getArray()[ len ] = std::move(perm);
} }
token = reader.assureToken(); // next permissions token token = reader.assureToken(); // next permissions token

2
svtools/source/filter/DocumentToGraphicRenderer.cxx
View file

@ -90,7 +90,7 @@ DocumentToGraphicRenderer::DocumentToGraphicRenderer( const Reference<XComponent
* So disable the selection already here. The current page * So disable the selection already here. The current page
* the cursor is on is rendered. */ * the cursor is on is rendered. */
if (!isWriter()) if (!isWriter())
maSelection = aViewSelection; maSelection = std::move(aViewSelection);
} }
} }
} }

2
svx/source/tbxctrls/tbcontrl.cxx
View file

@ -2001,7 +2001,7 @@ void SvxFontNameBox_Base::Select(bool bNonTravelSelect)
Any a; Any a;
pFontItem->QueryValue( a ); pFontItem->QueryValue( a );
pArgs[0].Value = a; pArgs[0].Value = std::move(a);
} }
const Reference<XDispatchProvider> xProvider(m_xFrame, UNO_QUERY); const Reference<XDispatchProvider> xProvider(m_xFrame, UNO_QUERY);

6
sw/source/core/access/accpara.cxx
View file

@ -1513,7 +1513,7 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
PropertyValue rPropVal; PropertyValue rPropVal;
rPropVal.Name = pEntry->aName; rPropVal.Name = pEntry->aName;
rPropVal.Value = aVal; rPropVal.Value = std::move(aVal);
rPropVal.Handle = -1; rPropVal.Handle = -1;
rPropVal.State = beans::PropertyState_DEFAULT_VALUE; rPropVal.State = beans::PropertyState_DEFAULT_VALUE;
@ -1705,7 +1705,7 @@ void SwAccessibleParagraph::_getRunAttributesImpl(
PropertyValue rPropVal; PropertyValue rPropVal;
rPropVal.Name = pEntry->aName; rPropVal.Name = pEntry->aName;
rPropVal.Value = aVal; rPropVal.Value = std::move(aVal);
rPropVal.Handle = -1; rPropVal.Handle = -1;
rPropVal.State = PropertyState_DIRECT_VALUE; rPropVal.State = PropertyState_DIRECT_VALUE;
@ -1809,7 +1809,7 @@ void SwAccessibleParagraph::_getSupplementalAttributesImpl(
PropertyValue rPropVal; PropertyValue rPropVal;
rPropVal.Name = rEntry.aName; rPropVal.Name = rEntry.aName;
rPropVal.Value = aVal; rPropVal.Value = std::move(aVal);
rPropVal.Handle = -1; rPropVal.Handle = -1;
rPropVal.State = beans::PropertyState_DEFAULT_VALUE; rPropVal.State = beans::PropertyState_DEFAULT_VALUE;

2
sw/source/core/unocore/unoparagraph.cxx
View file

@ -758,7 +758,7 @@ SwXParagraph::GetPropertyValuesTolerant_Impl(
} }
} }
rResult.Value = aValue; rResult.Value = std::move(aValue);
rResult.Result = beans::TolerantPropertySetResultType::SUCCESS; rResult.Result = beans::TolerantPropertySetResultType::SUCCESS;
nIdx++; nIdx++;

2
sw/source/core/unocore/unostyle.cxx
View file

@ -4176,7 +4176,7 @@ uno::Sequence< uno::Any > SwXAutoStyle::GetPropertyValues_Impl(
} }
// add value // add value
pValues[i] = aTarget; pValues[i] = std::move(aTarget);
} }
return aRet; return aRet;

4
test/source/sheet/databaseimportdescriptor.cxx
View file

@ -45,7 +45,7 @@ void DatabaseImportDescriptor::testDatabaseImportDescriptorProperties()
CPPUNIT_ASSERT_EQUAL_MESSAGE(aMsgGet.getStr(), u""_ustr, aValue); CPPUNIT_ASSERT_EQUAL_MESSAGE(aMsgGet.getStr(), u""_ustr, aValue);
aNewValue <<= u"New"_ustr; aNewValue <<= u"New"_ustr;
rPropValue.Value = aNewValue; rPropValue.Value = std::move(aNewValue);
aOldValue = rPropValue.Value; aOldValue = rPropValue.Value;
aOldValue >>= aValue; aOldValue >>= aValue;
@ -63,7 +63,7 @@ void DatabaseImportDescriptor::testDatabaseImportDescriptorProperties()
CPPUNIT_ASSERT_MESSAGE(aMsgGet.getStr(), !aValue); CPPUNIT_ASSERT_MESSAGE(aMsgGet.getStr(), !aValue);
aNewValue <<= true; aNewValue <<= true;
rPropValue.Value = aNewValue; rPropValue.Value = std::move(aNewValue);
aOldValue = rPropValue.Value; aOldValue = rPropValue.Value;
aOldValue >>= aValue; aOldValue >>= aValue;

4
test/source/style/xstyleloader.cxx
View file

@ -73,9 +73,7 @@ void XStyleLoader::testLoadStylesFromStream()
aOptions.realloc(nLength + 1); aOptions.realloc(nLength + 1);
beans::PropertyValue aInputStream; beans::PropertyValue aInputStream;
aInputStream.Name = "InputStream"; aInputStream.Name = "InputStream";
uno::Any aTmp; aInputStream.Value <<= xInputStream;
aTmp <<= xInputStream;
aInputStream.Value = aTmp;
aOptions.getArray()[nLength] = std::move(aInputStream); aOptions.getArray()[nLength] = std::move(aInputStream);
xStyleLoader->loadStylesFromURL(u"private:stream"_ustr, aOptions); xStyleLoader->loadStylesFromURL(u"private:stream"_ustr, aOptions);

4
toolkit/source/controls/formattedcontrol.cxx
View file

@ -235,15 +235,13 @@ namespace toolkit
} }
} }
void UnoControlFormattedFieldModel::impl_updateCachedFormatKey_nothrow(std::unique_lock<std::mutex>& rGuard) void UnoControlFormattedFieldModel::impl_updateCachedFormatKey_nothrow(std::unique_lock<std::mutex>& rGuard)
{ {
Any aFormatKey; Any aFormatKey;
getFastPropertyValue( rGuard, aFormatKey, BASEPROPERTY_FORMATKEY ); getFastPropertyValue( rGuard, aFormatKey, BASEPROPERTY_FORMATKEY );
m_aCachedFormat = aFormatKey; m_aCachedFormat = std::move(aFormatKey);
} }
void UnoControlFormattedFieldModel::dispose( ) void UnoControlFormattedFieldModel::dispose( )
{ {
UnoControlModel::dispose(); UnoControlModel::dispose();

2
toolkit/source/controls/unocontrolmodel.cxx
View file

@ -967,7 +967,7 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre
if ( maData.find( nPropId ) != maData.end() ) if ( maData.find( nPropId ) != maData.end() )
{ {
aProps.getArray()[i] = GetPropertyName( nPropId ); aProps.getArray()[i] = GetPropertyName( nPropId );
aValues.getArray()[i] = aValue; aValues.getArray()[i] = std::move(aValue);
} }
else else
{ {

3
ucb/source/core/ucbcmds.cxx
View file

@ -759,8 +759,7 @@ void transferProperties(
{ {
rCurrValue.Name = rCurrProp.Name; rCurrValue.Name = rCurrProp.Name;
rCurrValue.Handle = rCurrProp.Handle; rCurrValue.Handle = rCurrProp.Handle;
rCurrValue.Value = aValue; rCurrValue.Value = std::move(aValue);
// rCurrValue.State =
nWritePos++; nWritePos++;
} }

10
ucb/source/core/ucbstore.cxx
View file

@ -1105,7 +1105,7 @@ Reference< XPropertySetInfo > SAL_CALL PersistentPropertySet::getPropertySetInfo
// virtual // virtual
void SAL_CALL PersistentPropertySet::setPropertyValue( const OUString& aPropertyName, void SAL_CALL PersistentPropertySet::setPropertyValue( const OUString& aPropertyName,
const Any& aValue ) const Any& rValue )
{ {
std::unique_lock aCGuard(m_aMutex); std::unique_lock aCGuard(m_aMutex);
@ -1136,13 +1136,13 @@ void SAL_CALL PersistentPropertySet::setPropertyValue( const OUString& aProperty
= xRootHierNameAccess->getByHierarchicalName( = xRootHierNameAccess->getByHierarchicalName(
aValueName ); aValueName );
// Check value type. // Check value type.
if ( aOldValue.getValueType() != aValue.getValueType() ) if ( aOldValue.getValueType() != rValue.getValueType() )
{ {
throw IllegalArgumentException(); throw IllegalArgumentException();
} }
// Write value // Write value
xNameReplace->replaceByName( u"Value"_ustr, aValue ); xNameReplace->replaceByName( u"Value"_ustr, rValue );
// Write state ( Now it is a directly set value ) // Write state ( Now it is a directly set value )
xNameReplace->replaceByName( xNameReplace->replaceByName(
@ -1167,8 +1167,8 @@ void SAL_CALL PersistentPropertySet::setPropertyValue( const OUString& aProperty
aEvt.PropertyName = aPropertyName; aEvt.PropertyName = aPropertyName;
aEvt.PropertyHandle = nHandle; aEvt.PropertyHandle = nHandle;
aEvt.Further = false; aEvt.Further = false;
aEvt.OldValue = aOldValue; aEvt.OldValue = std::move(aOldValue);
aEvt.NewValue = aValue; aEvt.NewValue = rValue;
notifyPropertyChangeEvent( aCGuard, aEvt ); notifyPropertyChangeEvent( aCGuard, aEvt );
} }

2
ucb/source/ucp/hierarchy/hierarchycontent.cxx
View file

@ -1173,7 +1173,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues(
rValue.Name, rValue.Value ); rValue.Name, rValue.Value );
aEvent.PropertyName = rValue.Name; aEvent.PropertyName = rValue.Name;
aEvent.OldValue = aOldValue; aEvent.OldValue = std::move(aOldValue);
aEvent.NewValue = rValue.Value; aEvent.NewValue = rValue.Value;
aChanges.getArray()[ nChanged ] = aEvent; aChanges.getArray()[ nChanged ] = aEvent;

2
ucb/source/ucp/package/pkgcontent.cxx
View file

@ -1221,7 +1221,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
rValue.Name, rValue.Value ); rValue.Name, rValue.Value );
aEvent.PropertyName = rValue.Name; aEvent.PropertyName = rValue.Name;
aEvent.OldValue = aOldValue; aEvent.OldValue = std::move(aOldValue);
aEvent.NewValue = rValue.Value; aEvent.NewValue = rValue.Value;
aChanges.getArray()[ nChanged ] = aEvent; aChanges.getArray()[ nChanged ] = aEvent;

2
ucb/source/ucp/tdoc/tdoc_content.cxx
View file

@ -1225,7 +1225,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
rValue.Name, rValue.Value ); rValue.Name, rValue.Value );
aEvent.PropertyName = rValue.Name; aEvent.PropertyName = rValue.Name;
aEvent.OldValue = aOldValue; aEvent.OldValue = std::move(aOldValue);
aEvent.NewValue = rValue.Value; aEvent.NewValue = rValue.Value;
aChanges.getArray()[ nChanged ] = aEvent; aChanges.getArray()[ nChanged ] = aEvent;

2
ucb/source/ucp/webdav-curl/webdavcontent.cxx
View file

@ -1944,7 +1944,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
rName, rValue.Value ); rName, rValue.Value );
aEvent.PropertyName = rName; aEvent.PropertyName = rName;
aEvent.OldValue = aOldValue; aEvent.OldValue = std::move(aOldValue);
aEvent.NewValue = rValue.Value; aEvent.NewValue = rValue.Value;
aChanges.getArray()[ nChanged ] = aEvent; aChanges.getArray()[ nChanged ] = aEvent;

2
unotools/source/ucbhelper/ucblockbytes.cxx
View file

@ -605,7 +605,7 @@ void SAL_CALL Moderator::run()
{ {
salhelper::ConditionModifier aMod(m_aRes); salhelper::ConditionModifier aMod(m_aRes);
m_aResultType = aResultType; m_aResultType = aResultType;
m_aResult = aResult; m_aResult = std::move(aResult);
m_nIOErrorCode = nIOErrorCode; m_nIOErrorCode = nIOErrorCode;
} }
} }

2
xmloff/source/chart/SchXMLPlotAreaContext.cxx
View file

@ -366,7 +366,7 @@ void SchXMLPlotAreaContext::startFastElement (sal_Int32 /*nElement*/,
} }
} }
} }
mrSeriesDefaultsAndStyles.maDeepDefault = aDeepProperty; mrSeriesDefaultsAndStyles.maDeepDefault = std::move(aDeepProperty);
xProp->getPropertyValue(u"NumberOfLines"_ustr) >>= mnNumOfLinesProp; xProp->getPropertyValue(u"NumberOfLines"_ustr) >>= mnNumOfLinesProp;
xProp->getPropertyValue(u"Volume"_ustr) >>= mbStockHasVolume; xProp->getPropertyValue(u"Volume"_ustr) >>= mbStockHasVolume;

2
xmloff/source/core/xmluconv.cxx
View file

@ -812,7 +812,7 @@ void SvXMLUnitConverter::convertPropertySet(uno::Sequence<beans::PropertyValue>&
beans::PropertyValue aValue; beans::PropertyValue aValue;
aValue.Name = rProp.Name; aValue.Name = rProp.Name;
aValue.Value = aPropertyValue; aValue.Value = std::move(aPropertyValue);
aPropsVec.push_back(aValue); aPropsVec.push_back(aValue);
} }
rProps = comphelper::containerToSequence(aPropsVec); rProps = comphelper::containerToSequence(aPropsVec);

2
xmloff/source/draw/sdpropls.cxx
View file

@ -994,7 +994,7 @@ public:
if (!rValue.hasValue() || if (!rValue.hasValue() ||
rValue.get<drawing::TextFitToSizeType>() < any.get<drawing::TextFitToSizeType>()) rValue.get<drawing::TextFitToSizeType>() < any.get<drawing::TextFitToSizeType>())
{ {
rValue = any; rValue = std::move(any);
} }
return true; return true;
} }

2
xmloff/source/style/XMLFontStylesContext.cxx
View file

@ -89,7 +89,7 @@ void XMLFontStyleContextFontFace::SetAttribute( sal_Int32 nElement,
case XML_ELEMENT(STYLE, XML_FONT_CHARSET): case XML_ELEMENT(STYLE, XML_FONT_CHARSET):
if( GetStyles()->GetEncodingHdl().importXML( rValue, aAny, if( GetStyles()->GetEncodingHdl().importXML( rValue, aAny,
rUnitConv ) ) rUnitConv ) )
aEnc = aAny; aEnc = std::move(aAny);
break; break;
default: default:
SvXMLStyleContext::SetAttribute( nElement, rValue ); SvXMLStyleContext::SetAttribute( nElement, rValue );

4
xmloff/source/text/XMLIndexSimpleEntryContext.cxx
View file

@ -100,7 +100,6 @@ void XMLIndexSimpleEntryContext::FillPropertyValues(
// directly into the slots. Subclasses will have to know they can // directly into the slots. Subclasses will have to know they can
// only use slot so-and-so. // only use slot so-and-so.
Any aAny;
auto pValues = rValues.getArray(); auto pValues = rValues.getArray();
// token type // token type
@ -111,10 +110,9 @@ void XMLIndexSimpleEntryContext::FillPropertyValues(
if (m_bCharStyleNameOK) if (m_bCharStyleNameOK)
{ {
pValues[1].Name = "CharacterStyleName"; pValues[1].Name = "CharacterStyleName";
aAny <<= GetImport().GetStyleDisplayName( pValues[1].Value <<= GetImport().GetStyleDisplayName(
XmlStyleFamily::TEXT_TEXT, XmlStyleFamily::TEXT_TEXT,
m_sCharStyleName ); m_sCharStyleName );
pValues[1].Value = aAny;
} }
} }

4
xmloff/source/text/XMLIndexSpanEntryContext.cxx
View file

@ -54,10 +54,8 @@ void XMLIndexSpanEntryContext::FillPropertyValues(
// content // content
auto pValues = rValues.getArray(); auto pValues = rValues.getArray();
Any aAny;
aAny <<= sContent.makeStringAndClear();
pValues[m_nValues-1].Name = "Text"; pValues[m_nValues-1].Name = "Text";
pValues[m_nValues-1].Value = aAny; pValues[m_nValues-1].Value <<= sContent.makeStringAndClear();
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

7
xmloff/source/text/txtfldi.cxx
View file

@ -2967,7 +2967,6 @@ void XMLBibliographyFieldImportContext::startFastElement(
auto nToken = aIter.getToken() & TOKEN_MASK; auto nToken = aIter.getToken() & TOKEN_MASK;
PropertyValue aValue; PropertyValue aValue;
aValue.Name = MapBibliographyFieldName(nToken); aValue.Name = MapBibliographyFieldName(nToken);
Any aAny;
// special treatment for bibliography type // special treatment for bibliography type
// biblio vs bibilio: #96658#; also read old documents // biblio vs bibilio: #96658#; also read old documents
@ -2979,8 +2978,7 @@ void XMLBibliographyFieldImportContext::startFastElement(
nTmp, aIter.toView(), nTmp, aIter.toView(),
aBibliographyDataTypeMap)) aBibliographyDataTypeMap))
{ {
aAny <<= static_cast<sal_Int16>(nTmp); aValue.Value <<= static_cast<sal_Int16>(nTmp);
aValue.Value = aAny;
aValues.push_back(aValue); aValues.push_back(aValue);
} }
@ -2992,8 +2990,7 @@ void XMLBibliographyFieldImportContext::startFastElement(
{ {
aStringValue = GetImport().GetAbsoluteReference(aStringValue); aStringValue = GetImport().GetAbsoluteReference(aStringValue);
} }
aAny <<= aStringValue; aValue.Value <<= aStringValue;
aValue.Value = aAny;
aValues.push_back(aValue); aValues.push_back(aValue);
} }