diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-17 13:14:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-24 07:58:13 +0100 |
| commit | 570786e75add710df9bf77fa53b75e22dc29de89 (patch) | |
| tree | 953a6c06bd0525bfd38bd87959fd1afe58acf81f /framework/inc | |
| parent | 8eab42ddce2e9a01e65d82e2e5741a7d59fdd6ba (diff) | |
loplugin:useuniqueptr in LayoutManager
Change-Id: I93383fcb5f0093416914722e25cd0faf70c040eb
Reviewed-on: https://gerrit.libreoffice.org/48422
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/services/layoutmanager.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 8ef46a21de72..eaecc6fa8e87 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -165,7 +165,7 @@ namespace framework /// Reading of settings - shared with ToolbarLayoutManager. static bool readWindowStateData( const OUString& rName, UIElement& rElementData, const css::uno::Reference< css::container::XNameAccess > &rPersistentWindowState, - GlobalSettings* &rGlobalSettings, bool &bInGlobalSettings, + std::unique_ptr<GlobalSettings> &rGlobalSettings, bool &bInGlobalSettings, const css::uno::Reference< css::uno::XComponentContext > &rComponentContext ); private: @@ -269,7 +269,7 @@ namespace framework css::uno::Reference< css::ui::XUIElementFactoryManager > m_xUIElementFactoryManager; css::uno::Reference< css::container::XNameAccess > m_xPersistentWindowState; css::uno::Reference< css::container::XNameAccess > m_xPersistentWindowStateSupplier; - GlobalSettings* m_pGlobalSettings; + std::unique_ptr<GlobalSettings> m_pGlobalSettings; OUString m_aModuleIdentifier; Timer m_aAsyncLayoutTimer; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; // container for ALL Listener |