include/svtools/svlbitm.hxx | 15 ------------- include/svtools/treelistbox.hxx | 3 -- svtools/source/contnr/svlbitm.cxx | 43 -------------------------------------- 3 files changed, 1 insertion(+), 60 deletions(-)
New commits: commit 532c2bba7d9985a10b112c880f21691f6b66c19c Author: Jochen Nitschke <j.nitschke+loger...@ok.de> Date: Fri Aug 26 01:58:01 2016 +0200 remove SvLBoxBmp class not used by anything Change-Id: I35d12bdd29c5aef43296ce4709e69b29f4685acc Reviewed-on: https://gerrit.libreoffice.org/28398 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noelgran...@gmail.com> diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx index 2e5f83e..f520f86 100644 --- a/include/svtools/svlbitm.hxx +++ b/include/svtools/svlbitm.hxx @@ -133,21 +133,6 @@ public: virtual void Clone(SvLBoxItem* pSource) override; }; -class SvLBoxBmp : public SvLBoxItem -{ - Image aBmp; -public: - SvLBoxBmp(); - virtual ~SvLBoxBmp(); - virtual SvLBoxItemType GetType() const override; - virtual void InitViewData( SvTreeListBox* ,SvTreeListEntry*, SvViewDataItem* = nullptr ) override; - virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext, - const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override; - virtual SvLBoxItem* Create() const override; - virtual void Clone( SvLBoxItem* pSource ) override; -}; - - class SVT_DLLPUBLIC SvLBoxButton : public SvLBoxItem { bool isVis; diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 9898716..25bbf74 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -50,7 +50,6 @@ class SvInplaceEdit2; class SvLBoxString; class SvLBoxButton; class SvLBoxContextBmp; -class SvLBoxBmp; class SvImpLBox; class SvLBoxButtonData; struct SvLBoxDDInfo; @@ -125,7 +124,7 @@ typedef sal_Int64 ExtendedWinBits; // disable the behavior of automatically selecting a "CurEntry" upon painting the control #define EWB_NO_AUTO_CURENTRY 0x00000001 -enum class SvLBoxItemType {String, Bmp, Button, ContextBmp}; +enum class SvLBoxItemType {String, Button, ContextBmp}; class SvLBoxTab { diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index 4aeb7ee..52c0da1 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -238,49 +238,6 @@ void SvLBoxString::InitViewData( } // *************************************************************** -// class SvLBoxBmp -// *************************************************************** - - -SvLBoxBmp::SvLBoxBmp() : SvLBoxItem() -{ -} - -SvLBoxBmp::~SvLBoxBmp() -{ -} - -SvLBoxItemType SvLBoxBmp::GetType() const -{ - return SvLBoxItemType::Bmp; -} - -void SvLBoxBmp::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, - SvViewDataItem* pViewData) -{ - if( !pViewData ) - pViewData = pView->GetViewDataItem( pEntry, this ); - pViewData->maSize = aBmp.GetSizePixel(); -} - -void SvLBoxBmp::Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext, - const SvViewDataEntry* /*pView*/, const SvTreeListEntry& /*rEntry*/) -{ - DrawImageFlags nStyle = rDev.IsEnabled() ? DrawImageFlags::NONE : DrawImageFlags::Disable; - rRenderContext.DrawImage(rPos, aBmp ,nStyle); -} - -SvLBoxItem* SvLBoxBmp::Create() const -{ - return new SvLBoxBmp; -} - -void SvLBoxBmp::Clone( SvLBoxItem* pSource ) -{ - aBmp = static_cast<SvLBoxBmp*>(pSource)->aBmp; -} - -// *************************************************************** // class SvLBoxButton // *************************************************************** _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits