diff options
| author | Aditya <adityasahu1511@gmail.com> | 2020-06-29 15:39:19 +0530 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2020-07-10 09:07:40 +0200 |
| commit | dd4c68b02578618d861a2df687823eaaa8ab35f8 (patch) | |
| tree | 73633d84d5b596ea1eb0fca818d9842d24e6367a /include | |
| parent | f2cb874d6de86dfffe13fe6f051b1ea84d8e628a (diff) | |
svx:Refactoring of GalleryTheme members to GalleryBinaryEngine
Moving of aSvDrawStorageRef into the binary engine and consequent changes
Change-Id: I7262c77ec8730fbbe516f9fb205c25c4e1f15ff5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96764
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/gallery1.hxx | 2 | ||||
| -rw-r--r-- | include/svx/gallerybinaryengine.hxx | 9 | ||||
| -rw-r--r-- | include/svx/galtheme.hxx | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx index f34a707cd712..15fa6e1d6629 100644 --- a/include/svx/gallery1.hxx +++ b/include/svx/gallery1.hxx @@ -53,6 +53,8 @@ public: static std::unique_ptr<GalleryBinaryEngine> createGalleryBinaryEngine(); const std::unique_ptr<GalleryBinaryEngine>& getGalleryBinaryEngine() const { return mpGalleryBinaryEngine; } + void callGalleryThemeInit(); + const OUString& GetThemeName() const { return aName; } const INetURLObject& GetThmURL() const { return mpGalleryBinaryEngine->GetThmURL(); } diff --git a/include/svx/gallerybinaryengine.hxx b/include/svx/gallerybinaryengine.hxx index 5b655cfc49fc..20be0b6cdfe0 100644 --- a/include/svx/gallerybinaryengine.hxx +++ b/include/svx/gallerybinaryengine.hxx @@ -22,7 +22,9 @@ #include <tools/urlobj.hxx> #include <svx/svxdllapi.h> #include <svx/galtheme.hxx> +#include <sot/storage.hxx> +class SotStorage; struct GalleryObject; class SVXCORE_DLLPUBLIC GalleryBinaryEngine @@ -32,10 +34,14 @@ private: INetURLObject aSdgURL; INetURLObject aSdvURL; INetURLObject aStrURL; + tools::SvRef<SotStorage> aSvDrawStorageRef; static INetURLObject ImplGetURLIgnoreCase(const INetURLObject& rURL); public: + void galleryThemeInit(bool bReadOnly); + void galleryThemeDestroy(); + static void CreateUniqueURL(const INetURLObject& rBaseURL, INetURLObject& aURL); OUString ReadStrFromIni(const OUString& aKeyName); @@ -50,6 +56,9 @@ public: const INetURLObject& GetSdvURL() const { return aSdvURL; } const INetURLObject& GetStrURL() const { return aStrURL; } + SAL_DLLPRIVATE void ImplCreateSvDrawStorage(bool bReadOnly); + SAL_DLLPRIVATE const tools::SvRef<SotStorage>& GetSvDrawStorage() const; + std::unique_ptr<SgaObject> implReadSgaObject(GalleryObject const* pEntry); bool implWriteSgaObject(const SgaObject& rObj, sal_uInt32 nPos, GalleryObject* pExistentEntry, OUString& aDestDir, diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index 44b13f0fd539..b262805a0744 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -32,7 +32,6 @@ namespace weld { class ComboBox; } -class SotStorage; class SotStorageStream; @@ -76,7 +75,6 @@ private: ::std::vector< std::unique_ptr<GalleryObject> > aObjectList; OUString m_aDestDir; bool m_bDestDirRelative; - tools::SvRef<SotStorage> aSvDrawStorageRef; Gallery* pParent; GalleryThemeEntry* pThm; sal_uInt32 mnThemeLockCount; @@ -85,7 +83,6 @@ private: bool bDragging; bool bAbortActualize; - SAL_DLLPRIVATE void ImplCreateSvDrawStorage(); SAL_DLLPRIVATE const GalleryObject* ImplGetGalleryObject(sal_uInt32 nPos) const { if (nPos < aObjectList.size()) @@ -158,7 +155,6 @@ public: SAL_DLLPRIVATE void AbortActualize() { bAbortActualize = true; } SAL_DLLPRIVATE Gallery* GetParent() const { return pParent; } - SAL_DLLPRIVATE const tools::SvRef<SotStorage>& GetSvDrawStorage() const; public: |