[Libreoffice-commits] core.git: include/svx svx/source

[Aditya (via logerrit)]

 include/svx/gallery1.hxx         |   14 +++++++-------
 svx/source/gallery2/gallery1.cxx |    6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 6ccd883409e4799aa334bbe1047f42c795c9457b
Author:     Aditya <adityasahu1511 at gmail.com>
AuthorDate: Thu Aug 27 02:20:53 2020 +0530
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Fri Sep 4 11:27:13 2020 +0200

    svx: Rename GalleryThemeEntry::mpGalleryBinaryEngineEntry
    
    Rename mpGalleryBinaryEngineEntry to mpGalleryStorageEngineEntry because
     GalleryThemeEntry will have 2 engines: GalleryBinaryEngineEntry and
     GalleryXMLEngineEntry.
    
    Change-Id: I348d8df111f33cceacdbfe746bc484802fc18d13
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101431
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index 9fa13929f4dd..f74a5b5882fb 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -38,7 +38,7 @@ class GalleryThemeEntry
 {
 private:
 
-    std::unique_ptr<GalleryBinaryEngineEntry>     mpGalleryBinaryEngineEntry;
+    std::unique_ptr<GalleryBinaryEngineEntry>     mpGalleryStorageEngineEntry;
     GalleryStorageLocations maGalleryStorageLocations;
     OUString                aName;
     sal_uInt32              nId;
@@ -53,17 +53,17 @@ public:
                                                bool bReadOnly, bool bNewFile,
                                                sal_uInt32 nId, bool bThemeNameFromResource );
 
-    std::unique_ptr<GalleryBinaryEngineEntry> createGalleryBinaryEngineEntry();
-    const std::unique_ptr<GalleryBinaryEngineEntry>& getGalleryBinaryEngineEntry() const { return mpGalleryBinaryEngineEntry; }
+    std::unique_ptr<GalleryBinaryEngineEntry> createGalleryStorageEngineEntry();
+    const std::unique_ptr<GalleryBinaryEngineEntry>& getGalleryStorageEngineEntry() const { return mpGalleryStorageEngineEntry; }
 
     const GalleryStorageLocations& getGalleryStorageLocations() const { return maGalleryStorageLocations; }
 
     const OUString&         GetThemeName() const { return aName; }
 
-    const INetURLObject&    GetThmURL() const { return mpGalleryBinaryEngineEntry->GetThmURL(); }
-    const INetURLObject&    GetSdgURL() const { return mpGalleryBinaryEngineEntry->GetSdgURL(); }
-    const INetURLObject&    GetSdvURL() const { return mpGalleryBinaryEngineEntry->GetSdvURL(); }
-    const INetURLObject&    GetStrURL() const { return mpGalleryBinaryEngineEntry->GetStrURL(); }
+    const INetURLObject&    GetThmURL() const { return mpGalleryStorageEngineEntry->GetThmURL(); }
+    const INetURLObject&    GetSdgURL() const { return mpGalleryStorageEngineEntry->GetSdgURL(); }
+    const INetURLObject&    GetSdvURL() const { return mpGalleryStorageEngineEntry->GetSdvURL(); }
+    const INetURLObject&    GetStrURL() const { return mpGalleryStorageEngineEntry->GetStrURL(); }
 
     bool                    IsReadOnly() const { return bReadOnly; }
     bool                    IsDefault() const;
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 19b69a0a9bcf..188abd2d995d 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -122,12 +122,12 @@ GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL,
     {
         GalleryBinaryEngineEntry::CreateUniqueURL(rBaseURL,aURL);
     }
-    mpGalleryBinaryEngineEntry = createGalleryBinaryEngineEntry();
+    mpGalleryStorageEngineEntry = createGalleryStorageEngineEntry();
     maGalleryStorageLocations.SetStorageLocations(aURL);
 
     SetModified( _bNewFile );
 
-    aName = mpGalleryBinaryEngineEntry->ReadStrFromIni( "name" );
+    aName = mpGalleryStorageEngineEntry->ReadStrFromIni( "name" );
 
     // This is awful - we shouldn't use these resources if we
     // possibly can avoid them
@@ -161,7 +161,7 @@ GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL,
         aName = rName;
 }
 
-std::unique_ptr<GalleryBinaryEngineEntry> GalleryThemeEntry::createGalleryBinaryEngineEntry()
+std::unique_ptr<GalleryBinaryEngineEntry> GalleryThemeEntry::createGalleryStorageEngineEntry()
 {
     std::unique_ptr<GalleryBinaryEngineEntry> pGalleryBinaryEngineEntry = std::make_unique<GalleryBinaryEngineEntry>(maGalleryStorageLocations);
     return pGalleryBinaryEngineEntry;