diff options
| -rw-r--r-- | include/sfx2/StyleManager.hxx | 3 | ||||
| -rw-r--r-- | include/svx/CommonStyleManager.hxx | 2 | ||||
| -rw-r--r-- | svx/source/styles/CommonStyleManager.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/sidebar/StylePresetsPanel.cxx | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/include/sfx2/StyleManager.hxx b/include/sfx2/StyleManager.hxx index 7c3bcfeb1d3f..593da26d7f4c 100644 --- a/include/sfx2/StyleManager.hxx +++ b/include/sfx2/StyleManager.hxx @@ -18,6 +18,7 @@ #include <svl/style.hxx> #include <sfx2/objsh.hxx> +#include <memory> namespace sfx2 { @@ -37,7 +38,7 @@ public: SfxStyleSheetBase* Search(const OUString& rStyleName, SfxStyleFamily eFamily); - virtual StylePreviewRenderer* CreateStylePreviewRenderer( + virtual std::unique_ptr<StylePreviewRenderer> CreateStylePreviewRenderer( OutputDevice& rOutputDev, SfxStyleSheetBase* pStyle, long nMaxHeight) = 0; }; diff --git a/include/svx/CommonStyleManager.hxx b/include/svx/CommonStyleManager.hxx index 7cd8a0a90bd5..261472124596 100644 --- a/include/svx/CommonStyleManager.hxx +++ b/include/svx/CommonStyleManager.hxx @@ -28,7 +28,7 @@ public: : StyleManager(rShell) {} - virtual sfx2::StylePreviewRenderer* CreateStylePreviewRenderer( + virtual std::unique_ptr<sfx2::StylePreviewRenderer> CreateStylePreviewRenderer( OutputDevice& rOutputDev, SfxStyleSheetBase* pStyle, long nMaxHeight) override; }; diff --git a/svx/source/styles/CommonStyleManager.cxx b/svx/source/styles/CommonStyleManager.cxx index 2dd825bcecef..e88b97aad7d3 100644 --- a/svx/source/styles/CommonStyleManager.cxx +++ b/svx/source/styles/CommonStyleManager.cxx @@ -14,11 +14,11 @@ namespace svx { -sfx2::StylePreviewRenderer* CommonStyleManager::CreateStylePreviewRenderer( +std::unique_ptr<sfx2::StylePreviewRenderer> CommonStyleManager::CreateStylePreviewRenderer( OutputDevice& rOutputDev, SfxStyleSheetBase* pStyle, long nMaxHeight) { - return new CommonStylePreviewRenderer(mrShell, rOutputDev, pStyle, nMaxHeight); + return std::unique_ptr<sfx2::StylePreviewRenderer>(new CommonStylePreviewRenderer(mrShell, rOutputDev, pStyle, nMaxHeight)); } } // end svx namespace diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx index e515ea30f761..aacaa9b5f462 100644 --- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx +++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx @@ -49,8 +49,8 @@ void renderPreview(sfx2::StyleManager* pStyleManager, OutputDevice& aOutputDevic if (pStyleSheet) { - sfx2::StylePreviewRenderer* pStylePreviewRenderer; - pStylePreviewRenderer = pStyleManager->CreateStylePreviewRenderer(aOutputDevice, pStyleSheet, nHeight); + std::unique_ptr<sfx2::StylePreviewRenderer> pStylePreviewRenderer + = pStyleManager->CreateStylePreviewRenderer(aOutputDevice, pStyleSheet, nHeight); pStylePreviewRenderer->recalculate(); pStylePreviewRenderer->render(aRect, sfx2::StylePreviewRenderer::RenderAlign::TOP); } |