include/svx/gallery1.hxx | 1 - svx/source/gallery2/gallery1.cxx | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-)
New commits: commit 86daf3617f2a5e59507f1e6d9a57ca6d39745db8 Author: Aditya <[email protected]> AuthorDate: Sat Aug 29 20:53:25 2020 +0530 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Sun Sep 6 12:46:34 2020 +0200 svx: Remove GalleryThemeEntry::createGalleryStorageEngineEntry() Change-Id: I8e96e5e21c635bcd1e76f2fb6903116cff500892 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101643 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx index 36f25a292877..f9b83afe606e 100644 --- a/include/svx/gallery1.hxx +++ b/include/svx/gallery1.hxx @@ -52,7 +52,6 @@ public: bool bReadOnly, bool bNewFile, sal_uInt32 nId, bool bThemeNameFromResource ); - static std::unique_ptr<GalleryBinaryEngineEntry> createGalleryStorageEngineEntry(); const std::unique_ptr<GalleryBinaryEngineEntry>& getGalleryStorageEngineEntry() const { return mpGalleryStorageEngineEntry; } GalleryStorageLocations& getGalleryStorageLocations() const { return *mpGalleryStorageEngineEntry->getGalleryStorageLocations(); } diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index d0a2da1836d7..7eee341227eb 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -122,7 +122,8 @@ GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL, { GalleryBinaryEngineEntry::CreateUniqueURL(rBaseURL,aURL); } - mpGalleryStorageEngineEntry = createGalleryStorageEngineEntry(); + + mpGalleryStorageEngineEntry = std::make_unique<GalleryBinaryEngineEntry>(); setStorageLocations(aURL); SetModified( _bNewFile ); @@ -161,12 +162,6 @@ GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL, aName = rName; } -std::unique_ptr<GalleryBinaryEngineEntry> GalleryThemeEntry::createGalleryStorageEngineEntry() -{ - std::unique_ptr<GalleryBinaryEngineEntry> pGalleryBinaryEngineEntry = std::make_unique<GalleryBinaryEngineEntry>(); - return pGalleryBinaryEngineEntry; -} - void GalleryThemeEntry::setStorageLocations(INetURLObject& rURL) { mpGalleryStorageEngineEntry->setStorageLocations(rURL); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
