diff options
| author | Aditya <adityasahu1511@gmail.com> | 2020-08-30 02:27:32 +0530 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2020-09-06 22:41:52 +0200 |
| commit | 8c5c8d42d5cee83e00e3ecf00a55c8f42e0b169e (patch) | |
| tree | 352ac074ac01fa5fcd8f8f31c2f0c6a950226a65 /include | |
| parent | 7b4b1cb7c753fadbc20892ef8cc961b7a61e8d19 (diff) | |
svx: Introduce createGalleryTheme() to GalleryThemeEntry
Let GalleryThemeEntry initialize GalleryTheme.
Change-Id: Ib81d95faf6561604a30a7d0a3d9dae808c83a398
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101655
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/gallery1.hxx | 9 | ||||
| -rw-r--r-- | include/svx/gallerybinaryengineentry.hxx | 6 | ||||
| -rw-r--r-- | include/svx/galtheme.hxx | 1 |
3 files changed, 12 insertions, 4 deletions
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx index f9b83afe606e..69ec2728a6df 100644 --- a/include/svx/gallery1.hxx +++ b/include/svx/gallery1.hxx @@ -33,6 +33,7 @@ class GalleryBinaryEngineEntry; class GalleryStorageLocations; +class GalleryTheme; class GalleryThemeEntry { @@ -56,6 +57,10 @@ public: GalleryStorageLocations& getGalleryStorageLocations() const { return *mpGalleryStorageEngineEntry->getGalleryStorageLocations(); } + GalleryTheme* createGalleryTheme(Gallery* pGallery); + + std::unique_ptr<GalleryBinaryEngine> createGalleryStorageEngine(GalleryObjectCollection& mrGalleryObjectCollection); + const OUString& GetThemeName() const { return aName; } bool IsReadOnly() const { return bReadOnly; } @@ -75,7 +80,7 @@ public: void removeTheme(); - std::unique_ptr<GalleryTheme> getCachedTheme(Gallery* pGallery) const; + std::unique_ptr<GalleryTheme> getCachedTheme(Gallery* pGallery); void setStorageLocations(INetURLObject& rURL); }; @@ -102,7 +107,7 @@ private: GalleryThemeEntry* ImplGetThemeEntry( const OUString& rThemeName ); - SAL_DLLPRIVATE GalleryTheme* ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry ); + SAL_DLLPRIVATE GalleryTheme* ImplGetCachedTheme( GalleryThemeEntry* pThemeEntry ); SAL_DLLPRIVATE void ImplDeleteCachedTheme( GalleryTheme const * pTheme ); Gallery& operator=( Gallery const & ) = delete; // MSVC2015 workaround diff --git a/include/svx/gallerybinaryengineentry.hxx b/include/svx/gallerybinaryengineentry.hxx index eeb989257e3b..b1130127765c 100644 --- a/include/svx/gallerybinaryengineentry.hxx +++ b/include/svx/gallerybinaryengineentry.hxx @@ -28,6 +28,8 @@ #include <svx/galleryfilestorageentry.hxx> class GalleryBinaryStorageLocations; +class GalleryObjectCollection; +class GalleryBinaryEngine; class GalleryBinaryEngineEntry : public GalleryFileStorageEntry { @@ -46,7 +48,6 @@ public: const INetURLObject& GetStrURL() const { return mpGalleryStorageLocations->GetStrURL(); } const std::unique_ptr<GalleryBinaryStorageLocations>& getGalleryStorageLocations() const - { return mpGalleryStorageLocations; } @@ -58,6 +59,9 @@ public: std::unique_ptr<GalleryTheme>& getCachedTheme(std::unique_ptr<GalleryTheme>& pNewTheme); void setStorageLocations(INetURLObject& rURL); + + std::unique_ptr<GalleryBinaryEngine> + createGalleryStorageEngine(GalleryObjectCollection& mrGalleryObjectCollection, bool& bReadOnly); }; SvStream& ReadGalleryTheme(SvStream& rIn, GalleryTheme& rTheme); diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index dcf5e7f198e4..61d360158847 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -68,7 +68,6 @@ private: bool bDragging; bool bAbortActualize; - std::unique_ptr<GalleryBinaryEngine> createGalleryStorageEngine(bool bReadOnly); const std::unique_ptr<GalleryBinaryEngine>& getGalleryStorageEngine() const { return mpGalleryStorageEngine; } SAL_DLLPRIVATE void ImplSetModified( bool bModified ); |