diff options
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/services/frame.cxx | 10 | ||||
| -rw-r--r-- | framework/source/uiconfiguration/globalsettings.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uiconfiguration/windowstateconfiguration.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index aa9568700a5c..02e72be1696d 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -1864,7 +1864,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL XFrameImpl::getProp } 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! @@ -1881,7 +1881,7 @@ void SAL_CALL XFrameImpl::setPropertyValue(const OUString& sProperty, css::uno::Any aCurrentValue = impl_getPropertyValue(aPropInfo.Handle); - bool bWillBeChanged = (aCurrentValue != aValue); + bool bWillBeChanged = (aCurrentValue != rValue); if (! bWillBeChanged) return; @@ -1889,14 +1889,14 @@ void SAL_CALL XFrameImpl::setPropertyValue(const OUString& sProperty, aEvent.PropertyName = aPropInfo.Name; aEvent.Further = false; aEvent.PropertyHandle = aPropInfo.Handle; - aEvent.OldValue = aCurrentValue; - aEvent.NewValue = aValue; + aEvent.OldValue = std::move(aCurrentValue); + aEvent.NewValue = rValue; aEvent.Source = m_xBroadcaster; if (impl_existsVeto(aEvent)) throw css::beans::PropertyVetoException(); - impl_setPropertyValue(aPropInfo.Handle, aValue); + impl_setPropertyValue(aPropInfo.Handle, rValue); impl_notifyChangeListener(aEvent); } diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index 41d4861390b8..df9b16352607 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -175,7 +175,7 @@ bool GlobalSettings_Access::GetToolbarStateInfo( GlobalSettings::StateInfo eStat else if ( eStateInfo == GlobalSettings::STATEINFO_DOCKED ) a = xNameAccess->getByName( m_aPropDocked ); - aValue = a; + aValue = std::move(a); return true; } } diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index ac470c6f4d58..2210b52edbcf 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -740,7 +740,7 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const OU // put value into the return sequence PropertyValue pv; pv.Name = m_aPropArray[i]; - pv.Value = a; + pv.Value = std::move(a); aPropVec.push_back(pv); } } |