include/sfx2/thumbnailview.hxx | 4 ++--
include/sfx2/thumbnailviewitem.hxx | 2 +-
sfx2/inc/emojiviewitem.hxx | 2 +-
sfx2/inc/templateviewitem.hxx | 2 +-
sfx2/source/control/emojicontrol.cxx | 2 +-
sfx2/source/control/recentdocsviewitem.hxx | 2 +-
sfx2/source/control/thumbnailview.cxx | 2 +-
sfx2/source/control/thumbnailviewacc.cxx | 2 +-
sfx2/source/control/thumbnailviewitem.cxx | 3 +--
sfx2/source/doc/templatedlg.cxx | 2 +-
solenv/clang-format/excludelist | 2 +-
11 files changed, 12 insertions(+), 13 deletions(-)
New commits:
commit 9877bf5c66ec8cf8d1c9485c3976578e7c5ddcf6
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Aug 19 16:06:12 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Aug 25 10:09:55 2020 +0200
move thumbnailviewitem.hxx
Change-Id: I151a98e34f7ae31dfe6a21fc1e9d0e7aa944248e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101025
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index f9dcac25b142..f2e90f94ac59 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -160,7 +160,7 @@ public:
*
**/
-class ThumbnailViewBase
+class SFX2_DLLPUBLIC ThumbnailViewBase
{
friend class ThumbnailViewAcc;
friend class ThumbnailViewItemAcc;
@@ -314,7 +314,7 @@ protected:
std::function<bool (const ThumbnailViewItem*)> maFilterFunc;
};
-class SfxThumbnailView : public weld::CustomWidgetController, public
ThumbnailViewBase
+class SFX2_DLLPUBLIC SfxThumbnailView : public weld::CustomWidgetController,
public ThumbnailViewBase
{
public:
SfxThumbnailView(std::unique_ptr<weld::ScrolledWindow> xWindow,
std::unique_ptr<weld::Menu> xMenu);
diff --git a/sfx2/inc/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx
similarity index 99%
rename from sfx2/inc/thumbnailviewitem.hxx
rename to include/sfx2/thumbnailviewitem.hxx
index e20a8c0b4f6d..d10bdbb14dc6 100644
--- a/sfx2/inc/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
@@ -61,7 +61,7 @@ struct ThumbnailItemAttributes
drawinglayer::attribute::FontAttribute aFontAttr;
};
-class ThumbnailViewItem
+class SFX2_DLLPUBLIC ThumbnailViewItem
{
public:
diff --git a/sfx2/inc/emojiviewitem.hxx b/sfx2/inc/emojiviewitem.hxx
index bbdcf329f392..a5d902946b1a 100644
--- a/sfx2/inc/emojiviewitem.hxx
+++ b/sfx2/inc/emojiviewitem.hxx
@@ -9,7 +9,7 @@
#pragma once
-#include "thumbnailviewitem.hxx"
+#include <sfx2/thumbnailviewitem.hxx>
class EmojiViewItem final : public ThumbnailViewItem
{
diff --git a/sfx2/inc/templateviewitem.hxx b/sfx2/inc/templateviewitem.hxx
index 536808f471a1..36d433b00119 100644
--- a/sfx2/inc/templateviewitem.hxx
+++ b/sfx2/inc/templateviewitem.hxx
@@ -9,7 +9,7 @@
#pragma once
-#include "thumbnailviewitem.hxx"
+#include <sfx2/thumbnailviewitem.hxx>
class TemplateViewItem : public ThumbnailViewItem
{
diff --git a/sfx2/source/control/emojicontrol.cxx
b/sfx2/source/control/emojicontrol.cxx
index 0ecf557ac564..a7d3718f3ee3 100644
--- a/sfx2/source/control/emojicontrol.cxx
+++ b/sfx2/source/control/emojicontrol.cxx
@@ -20,7 +20,7 @@
#include <emojicontrol.hxx>
#include <sfx2/emojipopup.hxx>
#include <emojiview.hxx>
-#include <thumbnailviewitem.hxx>
+#include <sfx2/thumbnailviewitem.hxx>
#include <rtl/ustrbuf.hxx>
#include <comphelper/propertysequence.hxx>
#include <comphelper/dispatchcommand.hxx>
diff --git a/sfx2/source/control/recentdocsviewitem.hxx
b/sfx2/source/control/recentdocsviewitem.hxx
index fb259c2d3a0a..b541c00d317f 100644
--- a/sfx2/source/control/recentdocsviewitem.hxx
+++ b/sfx2/source/control/recentdocsviewitem.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX
#define INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX
-#include <thumbnailviewitem.hxx>
+#include <sfx2/thumbnailviewitem.hxx>
class ThumbnailView;
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 902f62857765..a607493119a4 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -8,7 +8,7 @@
*/
#include <sfx2/thumbnailview.hxx>
-#include <thumbnailviewitem.hxx>
+#include <sfx2/thumbnailviewitem.hxx>
#include <utility>
diff --git a/sfx2/source/control/thumbnailviewacc.cxx
b/sfx2/source/control/thumbnailviewacc.cxx
index e1a7a59c9f2a..53423bd567ae 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -21,7 +21,7 @@
#include <comphelper/servicehelper.hxx>
#include <sfx2/thumbnailview.hxx>
-#include <thumbnailviewitem.hxx>
+#include <sfx2/thumbnailviewitem.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/sfx2/source/control/thumbnailviewitem.cxx
b/sfx2/source/control/thumbnailviewitem.cxx
index bd75307faff1..0830689498e8 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <thumbnailviewitem.hxx>
-
+#include <sfx2/thumbnailviewitem.hxx>
#include <sfx2/thumbnailview.hxx>
#include "thumbnailviewacc.hxx"
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 9276c67ca000..5144fae20a4b 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -27,7 +27,7 @@
#include <sfx2/templatelocalview.hxx>
#include <templatecontaineritem.hxx>
#include <templateviewitem.hxx>
-#include <thumbnailviewitem.hxx>
+#include <sfx2/thumbnailviewitem.hxx>
#include <sot/storage.hxx>
#include <svtools/imagemgr.hxx>
#include <svtools/langhelp.hxx>
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index e30a82513bfa..2b14dbb51193 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -6448,6 +6448,7 @@ include/sfx2/templatedlg.hxx
include/sfx2/templatelocalview.hxx
include/sfx2/templateproperties.hxx
include/sfx2/thumbnailview.hxx
+include/sfx2/thumbnailviewitem.hxx
include/sfx2/titledockwin.hxx
include/sfx2/tplpitem.hxx
include/sfx2/userinputinterception.hxx
@@ -11932,7 +11933,6 @@ sfx2/inc/strings.hxx
sfx2/inc/templatecontaineritem.hxx
sfx2/inc/templatedefaultview.hxx
sfx2/inc/templateviewitem.hxx
-sfx2/inc/thumbnailviewitem.hxx
sfx2/inc/unoctitm.hxx
sfx2/qa/cppunit/test_classification.cxx
sfx2/qa/cppunit/test_controlleritem.cxx
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
