diff options
author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-03 20:02:30 +0000 |
---|---|---|
committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-04 10:48:59 +0100 |
commit | d51640061809034006db6d7ba1205c1f1f8b5fad (patch) | |
tree | 7863e49a1be50f602fd0380fe3af95545c12ec92 /framework | |
parent | 9ddca3616fc8b91973b9f261fd53797f9c84570f (diff) |
cid#1546422 COPY_INSTEAD_OF_MOVE
and
cid#1546416 COPY_INSTEAD_OF_MOVE
cid#1546415 COPY_INSTEAD_OF_MOVE
cid#1546391 COPY_INSTEAD_OF_MOVE
cid#1546390 COPY_INSTEAD_OF_MOVE
cid#1546317 COPY_INSTEAD_OF_MOVE
cid#1546252 COPY_INSTEAD_OF_MOVE
cid#1546251 COPY_INSTEAD_OF_MOVE
cid#1546249 COPY_INSTEAD_OF_MOVE
cid#1546243 COPY_INSTEAD_OF_MOVE
cid#1546195 COPY_INSTEAD_OF_MOVE
cid#1546193 COPY_INSTEAD_OF_MOVE
cid#1546137 COPY_INSTEAD_OF_MOVE
cid#1545738 COPY_INSTEAD_OF_MOVE
cid#1545782 COPY_INSTEAD_OF_MOVE
Change-Id: I10d5091aa72b682371764b8a18cc5062e272c031
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160285
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 3 | ||||
-rw-r--r-- | framework/source/uiconfiguration/uiconfigurationmanager.cxx | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 7427cd925956..65e12c8f8dd3 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -1243,14 +1243,13 @@ void SAL_CALL ModuleUIConfigurationManager::replaceSettings( const OUString& Res rElements.emplace( ResourceURL, aUIElementData ); Reference< XUIConfigurationManager > xThis(this); - Reference< XInterface > xIfac( xThis, UNO_QUERY ); // Create event to notify listener about replaced element settings ui::ConfigurationEvent aEvent; aEvent.ResourceURL = ResourceURL; aEvent.Accessor <<= xThis; - aEvent.Source = xIfac; + aEvent.Source.set(xThis, UNO_QUERY); aEvent.ReplacedElement <<= pDataSettings->xSettings; aEvent.Element <<= aUIElementData.xSettings; diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 0140d17866d1..b678f7b0635c 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -1027,14 +1027,14 @@ void SAL_CALL UIConfigurationManager::removeSettings( const OUString& ResourceUR rElementType.bModified = true; Reference< XUIConfigurationManager > xThis(this); - Reference< XInterface > xIfac( xThis, UNO_QUERY ); // Create event to notify listener about removed element settings ConfigurationEvent aEvent; aEvent.ResourceURL = ResourceURL; aEvent.Accessor <<= xThis; - aEvent.Source = xIfac; + aEvent.Source.set(xThis, UNO_QUERY); + aEvent.Element <<= xRemovedSettings; aGuard.clear(); |