include/svx/gallery1.hxx | 12 +++++++-----
include/svx/galleryobjectcollection.hxx | 4 +++-
include/svx/galtheme.hxx | 17 +++++++++--------
svx/inc/gallerybinaryengine.hxx | 4 ++--
svx/inc/gallerybinaryengineentry.hxx | 6 +++---
svx/inc/gallerybinarystoragelocations.hxx | 2 +-
svx/qa/unit/gallery/test_gallery.cxx | 4 ++--
svx/source/gallery2/galini.cxx | 2 +-
svx/source/gallery2/gallery1.cxx | 10 +++++++++-
svx/source/gallery2/gallerybinaryengine.cxx | 3 ++-
svx/source/gallery2/gallerybinaryengineentry.cxx | 2 +-
svx/source/gallery2/gallerybinarystoragelocations.cxx | 2 +-
svx/source/gallery2/galleryfilestorage.cxx | 2 +-
svx/source/gallery2/galleryfilestorageentry.cxx | 2 +-
svx/source/gallery2/gallerystoragelocations.cxx | 2 +-
svx/source/gallery2/galtheme.cxx | 2 ++
svx/source/unogallery/unogalitem.cxx | 1 +
17 files changed, 47 insertions(+), 30 deletions(-)
New commits:
commit 47378fcb3ca35bbe9fc27e9c062479dc5812138b
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon May 8 11:51:44 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue May 9 07:51:25 2023 +0200
move some gallery header files inside svx
They are not used outside svx.
Change-Id: Ib9ef73ec19a12401ea808922aba49e0ce1625378
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151501
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index 708d6fa0d718..7b6fe2b23dc5 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -24,18 +24,19 @@
#include <svl/SfxBroadcaster.hxx>
#include <svx/svxdllapi.h>
#include <tools/urlobj.hxx>
-#include <svx/gallerybinaryengineentry.hxx>
-#include <svx/gallerybinaryengine.hxx>
#include <cstdio>
#include <memory>
#include <vector>
+class Gallery;
+class GalleryBinaryEngine;
class GalleryBinaryEngineEntry;
+class GalleryObjectCollection;
class GalleryStorageLocations;
class GalleryTheme;
-class GalleryThemeEntry
+class SVXCORE_DLLPUBLIC GalleryThemeEntry
{
private:
@@ -52,10 +53,11 @@ public:
const OUString& rName,
bool bReadOnly, bool bNewFile,
sal_uInt32 nId, bool
bThemeNameFromResource );
-
+ ~GalleryThemeEntry();
+
const std::unique_ptr<GalleryBinaryEngineEntry>&
getGalleryStorageEngineEntry() const { return mpGalleryStorageEngineEntry; }
- GalleryStorageLocations& getGalleryStorageLocations() const { return
*mpGalleryStorageEngineEntry->getGalleryStorageLocations(); }
+ GalleryStorageLocations& getGalleryStorageLocations() const;
GalleryTheme* createGalleryTheme(Gallery* pGallery);
diff --git a/include/svx/galleryobjectcollection.hxx
b/include/svx/galleryobjectcollection.hxx
index ec27761cc07e..a363f06de4ca 100644
--- a/include/svx/galleryobjectcollection.hxx
+++ b/include/svx/galleryobjectcollection.hxx
@@ -28,7 +28,9 @@
#include <optional>
#include <vector>
-struct GalleryObject
+class GalleryObjectStorage;
+
+struct SVXCORE_DLLPUBLIC GalleryObject
{
std::optional<INetURLObject> m_oStorageUrl;
sal_uInt32 nOffset;
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 585293be0ae2..e3ef7f7d991f 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -22,7 +22,6 @@
#include <svx/svxdllapi.h>
#include <svx/galleryobjectcollection.hxx>
-#include <svx/gallerybinaryengine.hxx>
#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
@@ -32,19 +31,21 @@
#include <svx/galmisc.hxx>
#include <memory>
-namespace weld { class ComboBox; }
-
-class SotStorageStream;
-
+class GalleryBinaryEngine;
class GalleryThemeEntry;
class SgaObject;
+class SotStorageStream;
class FmFormModel;
class Gallery;
-
namespace unogallery
{
- class GalleryTheme;
class GalleryItem;
+ class GalleryTheme;
+}
+namespace weld
+{
+ class ComboBox;
+ class Widget;
}
class SVXCORE_DLLPUBLIC GalleryTheme final : public SfxBroadcaster
@@ -152,7 +153,7 @@ public:
DateTime getModificationDate() const;
- const INetURLObject& getThemeURL() const { return
mpGalleryStorageEngine->getThemeURL(); }
+ const INetURLObject& getThemeURL() const;
public:
diff --git a/include/svx/gallerybinaryengine.hxx
b/svx/inc/gallerybinaryengine.hxx
similarity index 98%
rename from include/svx/gallerybinaryengine.hxx
rename to svx/inc/gallerybinaryengine.hxx
index 5e89b5dd756d..2863e8dc9d69 100644
--- a/include/svx/gallerybinaryengine.hxx
+++ b/svx/inc/gallerybinaryengine.hxx
@@ -22,8 +22,8 @@
#include <svx/galmisc.hxx>
#include <svx/svxdllapi.h>
#include <svx/fmmodel.hxx>
-#include <svx/gallerybinarystoragelocations.hxx>
-#include <svx/galleryfilestorage.hxx>
+#include "gallerybinarystoragelocations.hxx"
+#include "galleryfilestorage.hxx"
#include <tools/urlobj.hxx>
#include <sot/storage.hxx>
#include <vcl/salctype.hxx>
diff --git a/include/svx/gallerybinaryengineentry.hxx
b/svx/inc/gallerybinaryengineentry.hxx
similarity index 94%
rename from include/svx/gallerybinaryengineentry.hxx
rename to svx/inc/gallerybinaryengineentry.hxx
index f624e9177bd5..8b5b3d3f607b 100644
--- a/include/svx/gallerybinaryengineentry.hxx
+++ b/svx/inc/gallerybinaryengineentry.hxx
@@ -21,9 +21,9 @@
#include <tools/urlobj.hxx>
#include <svx/galtheme.hxx>
-#include <svx/gallerybinaryengine.hxx>
-#include <svx/gallerybinarystoragelocations.hxx>
-#include <svx/galleryfilestorageentry.hxx>
+#include "gallerybinaryengine.hxx"
+#include "gallerybinarystoragelocations.hxx"
+#include "galleryfilestorageentry.hxx"
class GalleryBinaryStorageLocations;
class GalleryObjectCollection;
diff --git a/include/svx/gallerybinarystoragelocations.hxx
b/svx/inc/gallerybinarystoragelocations.hxx
similarity index 97%
rename from include/svx/gallerybinarystoragelocations.hxx
rename to svx/inc/gallerybinarystoragelocations.hxx
index 6876c64a2a17..7d14299e5430 100644
--- a/include/svx/gallerybinarystoragelocations.hxx
+++ b/svx/inc/gallerybinarystoragelocations.hxx
@@ -21,7 +21,7 @@
#include <tools/urlobj.hxx>
#include <svx/svxdllapi.h>
-#include <svx/gallerystoragelocations.hxx>
+#include "gallerystoragelocations.hxx"
class SVXCORE_DLLPUBLIC GalleryBinaryStorageLocations final : public
GalleryStorageLocations
{
diff --git a/include/svx/galleryfilestorage.hxx b/svx/inc/galleryfilestorage.hxx
similarity index 100%
rename from include/svx/galleryfilestorage.hxx
rename to svx/inc/galleryfilestorage.hxx
diff --git a/include/svx/galleryfilestorageentry.hxx
b/svx/inc/galleryfilestorageentry.hxx
similarity index 100%
rename from include/svx/galleryfilestorageentry.hxx
rename to svx/inc/galleryfilestorageentry.hxx
diff --git a/include/svx/gallerystoragelocations.hxx
b/svx/inc/gallerystoragelocations.hxx
similarity index 100%
rename from include/svx/gallerystoragelocations.hxx
rename to svx/inc/gallerystoragelocations.hxx
diff --git a/svx/qa/unit/gallery/test_gallery.cxx
b/svx/qa/unit/gallery/test_gallery.cxx
index 6a4c4965bbf3..cf868bd219fd 100644
--- a/svx/qa/unit/gallery/test_gallery.cxx
+++ b/svx/qa/unit/gallery/test_gallery.cxx
@@ -15,9 +15,9 @@
#include <svx/gallery1.hxx>
#include <svx/galtheme.hxx>
-#include <svx/gallerybinarystoragelocations.hxx>
-#include <svx/gallerystoragelocations.hxx>
+#include <gallerystoragelocations.hxx>
#include <galobj.hxx>
+#include <gallerybinarystoragelocations.hxx>
#include <cppunit/TestAssert.h>
#include <cppunit/extensions/HelperMacros.h>
diff --git a/svx/source/gallery2/galini.cxx b/svx/source/gallery2/galini.cxx
index 8cdfb23ae1a2..4eaf301d8edc 100644
--- a/svx/source/gallery2/galini.cxx
+++ b/svx/source/gallery2/galini.cxx
@@ -17,7 +17,7 @@
#include <sal/log.hxx>
#include <unotools/ucbstreamhelper.hxx>
-#include <svx/gallerybinaryengineentry.hxx>
+#include <gallerybinaryengineentry.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 1aef1cc73f9c..52fd3dd9b8bd 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -43,7 +43,7 @@
#include <svx/galmisc.hxx>
#include <svx/galtheme.hxx>
#include <svx/gallery1.hxx>
-#include <svx/gallerybinaryengineentry.hxx>
+#include <gallerybinaryengineentry.hxx>
#include <vcl/weld.hxx>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
@@ -163,6 +163,9 @@ GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL,
aName = rName;
}
+GalleryThemeEntry::~GalleryThemeEntry()
+{}
+
void GalleryThemeEntry::setStorageLocations(INetURLObject & rURL)
{
mpGalleryStorageEngineEntry->setStorageLocations(rURL);
@@ -721,4 +724,9 @@ bool GalleryThemeEntry::IsDefault() const
return nId > 0 && nId != GALLERY_THEME_MYTHEME;
}
+GalleryStorageLocations& GalleryThemeEntry::getGalleryStorageLocations() const
+{
+ return *mpGalleryStorageEngineEntry->getGalleryStorageLocations();
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/gallery2/gallerybinaryengine.cxx
b/svx/source/gallery2/gallerybinaryengine.cxx
index 46b618d90b61..b1c0e317cfb9 100644
--- a/svx/source/gallery2/gallerybinaryengine.cxx
+++ b/svx/source/gallery2/gallerybinaryengine.cxx
@@ -19,8 +19,9 @@
#include <svx/unomodel.hxx>
#include <svx/fmmodel.hxx>
+#include <svx/galtheme.hxx>
#include <galobj.hxx>
-#include <svx/gallerybinaryengine.hxx>
+#include <gallerybinaryengine.hxx>
#include <svx/galleryobjectcollection.hxx>
#include <svx/gallery1.hxx>
#include <osl/thread.hxx>
diff --git a/svx/source/gallery2/gallerybinaryengineentry.cxx
b/svx/source/gallery2/gallerybinaryengineentry.cxx
index 98df8a5c0a29..75f7cdda83c8 100644
--- a/svx/source/gallery2/gallerybinaryengineentry.cxx
+++ b/svx/source/gallery2/gallerybinaryengineentry.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svx/gallerybinaryengineentry.hxx>
+#include <gallerybinaryengineentry.hxx>
#include <svx/galmisc.hxx>
#include <svx/gallery1.hxx>
diff --git a/svx/source/gallery2/gallerybinarystoragelocations.cxx
b/svx/source/gallery2/gallerybinarystoragelocations.cxx
index dc896f6c3811..1fec54d10d9a 100644
--- a/svx/source/gallery2/gallerybinarystoragelocations.cxx
+++ b/svx/source/gallery2/gallerybinarystoragelocations.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svx/gallerybinarystoragelocations.hxx>
+#include <gallerybinarystoragelocations.hxx>
#include <svx/galmisc.hxx>
INetURLObject GalleryBinaryStorageLocations::ImplGetURLIgnoreCase(const
INetURLObject& rURL)
diff --git a/svx/source/gallery2/galleryfilestorage.cxx
b/svx/source/gallery2/galleryfilestorage.cxx
index dd8e74cd3af4..e8ce87ac3ecc 100644
--- a/svx/source/gallery2/galleryfilestorage.cxx
+++ b/svx/source/gallery2/galleryfilestorage.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svx/galleryfilestorage.hxx>
+#include <galleryfilestorage.hxx>
GalleryFileStorage::~GalleryFileStorage(){};
diff --git a/svx/source/gallery2/galleryfilestorageentry.cxx
b/svx/source/gallery2/galleryfilestorageentry.cxx
index d04f49bf805f..c0642145b2d8 100644
--- a/svx/source/gallery2/galleryfilestorageentry.cxx
+++ b/svx/source/gallery2/galleryfilestorageentry.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svx/galleryfilestorageentry.hxx>
+#include <galleryfilestorageentry.hxx>
GalleryFileStorageEntry::~GalleryFileStorageEntry(){};
diff --git a/svx/source/gallery2/gallerystoragelocations.cxx
b/svx/source/gallery2/gallerystoragelocations.cxx
index d71ae452fd71..a723a681b7b5 100644
--- a/svx/source/gallery2/gallerystoragelocations.cxx
+++ b/svx/source/gallery2/gallerystoragelocations.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svx/gallerystoragelocations.hxx>
+#include <gallerystoragelocations.hxx>
GalleryStorageLocations::~GalleryStorageLocations(){};
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 72e0f0dcecb6..1c034b2a769b 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -41,6 +41,7 @@
#include <svx/galtheme.hxx>
#include <svx/svdpage.hxx>
#include <svx/galleryobjectcollection.hxx>
+#include <gallerybinaryengine.hxx>
#include <galobj.hxx>
#include <svx/gallery1.hxx>
#include "gallerydrawmodel.hxx"
@@ -774,5 +775,6 @@ bool GalleryTheme::IsReadOnly() const { return
pThm->IsReadOnly(); }
bool GalleryTheme::IsDefault() const { return pThm->IsDefault(); }
const OUString& GalleryTheme::GetName() const { return pThm->GetThemeName(); }
+const INetURLObject& GalleryTheme::getThemeURL() const { return
mpGalleryStorageEngine->getThemeURL(); }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/unogallery/unogalitem.cxx
b/svx/source/unogallery/unogalitem.cxx
index c6ac0505e197..c3725b5fba1e 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -20,6 +20,7 @@
#include "unogalitem.hxx"
#include "unogaltheme.hxx"
+#include <gallerybinaryengine.hxx>
#include <svx/galtheme.hxx>
#include <svx/galmisc.hxx>
#include <svx/fmmodel.hxx>
