diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-09-09 11:39:13 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-09-13 12:32:11 +0200 |
commit | 1335eb09c1db7afcbabbcd047b239a5f4effc0e7 (patch) | |
tree | 72ca4536b184b76c68cbb775ba658ec7d06f07dd /include | |
parent | c3aedef39f768b266c3352dddf8f8adafc134dfa (diff) |
Related: tdf#144389: merge ThumbnailView and ThumbnailViewBase
only ThumbnailView inherits directly from ThumbnailViewBase and it will
simplify a11y if ThumbnailView instead of ThumbnailViewBase is available
Change-Id: I715faa3f9b2cec68c1de07479b7d1dbbd9ddbcc2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121848
Tested-by: Jenkins
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/sfx2/thumbnailview.hxx | 33 | ||||
-rw-r--r-- | include/sfx2/thumbnailviewitem.hxx | 6 |
2 files changed, 13 insertions, 26 deletions
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index c50b7bb91987..a8c61ab43692 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -159,29 +159,11 @@ public: * **/ -class SFX2_DLLPUBLIC ThumbnailViewBase +class SFX2_DLLPUBLIC ThumbnailView : public weld::CustomWidgetController { friend class ThumbnailViewAcc; friend class ThumbnailViewItemAcc; - virtual sal_uInt16 ImplGetVisibleItemCount() const = 0; - virtual ThumbnailViewItem* ImplGetVisibleItem(sal_uInt16 nVisiblePos) = 0; - - virtual css::uno::Reference<css::accessibility::XAccessible> getAccessible() = 0; - -public: - /// Updates information in the view; used only in RecentDocsView ATM. - virtual void Reload() {} - - virtual bool renameItem(ThumbnailViewItem* pItem, const OUString& sNewTitle); - - virtual bool isDrawMnemonic() const = 0; - - virtual ~ThumbnailViewBase(); -}; - -class SFX2_DLLPUBLIC ThumbnailView : public weld::CustomWidgetController, public ThumbnailViewBase -{ public: ThumbnailView(std::unique_ptr<weld::ScrolledWindow> xWindow, std::unique_ptr<weld::Menu> xMenu); @@ -189,6 +171,9 @@ public: virtual bool MouseMove(const MouseEvent& rMEvt) override; + /// Updates information in the view; used only in RecentDocsView ATM. + virtual void Reload() {} + void AppendItem(std::unique_ptr<ThumbnailViewItem> pItem); void RemoveItem(sal_uInt16 nItemId); @@ -206,7 +191,9 @@ public: sal_uInt16 getNextItemId () const; - virtual bool isDrawMnemonic() const override { return mbDrawMnemonics; } + virtual bool renameItem(ThumbnailViewItem* pItem, const OUString& sNewTitle); + + virtual bool isDrawMnemonic() const { return mbDrawMnemonics; } void setItemMaxTextLength (sal_uInt32 nLength); @@ -271,7 +258,7 @@ protected: virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; - virtual css::uno::Reference<css::accessibility::XAccessible> getAccessible() override; + virtual css::uno::Reference<css::accessibility::XAccessible> getAccessible(); protected: @@ -297,8 +284,8 @@ protected: void ImplDeleteItems(); size_t ImplGetItem( const Point& rPoint ) const; ThumbnailViewItem* ImplGetItem( size_t nPos ); - virtual sal_uInt16 ImplGetVisibleItemCount() const override; - virtual ThumbnailViewItem* ImplGetVisibleItem(sal_uInt16 nVisiblePos) override; + virtual sal_uInt16 ImplGetVisibleItemCount() const; + virtual ThumbnailViewItem* ImplGetVisibleItem(sal_uInt16 nVisiblePos); void ImplFireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue ); bool ImplHasAccessibleListeners(); DECL_LINK( ImplScrollHdl, weld::ScrolledWindow&, void ); diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx index 82c98e2c482d..d0da2edaec0a 100644 --- a/include/sfx2/thumbnailviewitem.hxx +++ b/include/sfx2/thumbnailviewitem.hxx @@ -32,7 +32,7 @@ namespace drawinglayer::primitive2d { class Primitive2DContainer; } const int THUMBNAILVIEW_ITEM_CORNER = 5; -class ThumbnailViewBase; +class ThumbnailView; class MouseEvent; namespace basegfx { @@ -66,7 +66,7 @@ class SFX2_DLLPUBLIC ThumbnailViewItem { public: - ThumbnailViewBase &mrParent; + ThumbnailView& mrParent; sal_uInt16 mnId; bool mbVisible; bool mbBorder; @@ -77,7 +77,7 @@ public: OUString maHelpText; css::uno::Reference< css::accessibility::XAccessible > mxAcc; - ThumbnailViewItem (ThumbnailViewBase &rView, sal_uInt16 nId); + ThumbnailViewItem(ThumbnailView& rView, sal_uInt16 nId); virtual ~ThumbnailViewItem (); |