From ac7acb0ab1329913b0cec79790adcde0263960be Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Thu, 11 Oct 2012 16:13:12 -0400 Subject: Merged SvTreeListBox and SvLBox. There is no reason to keep SvLBox separate. Change-Id: I0b34aa8f8ca539d4f4f0f9cea9fa9b8faec241e8 --- sd/source/ui/animations/CustomAnimationList.cxx | 18 ++++++++++-------- sd/source/ui/animations/CustomAnimationList.hxx | 2 +- sd/source/ui/dlg/RemoteDialog.hxx | 2 +- sd/source/ui/dlg/dlgassim.cxx | 1 + sd/source/ui/dlg/dlgassim.hxx | 2 +- sd/source/ui/inc/custsdlg.hxx | 2 +- sd/source/ui/inc/sdtreelb.hxx | 4 ++-- 7 files changed, 17 insertions(+), 14 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 55393d8ab8fb..a9378697ab37 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -45,6 +45,8 @@ #include #include "sdresid.hxx" +#include "svtools/svlbitm.hxx" + #include "res_bmp.hrc" #include "glob.hrc" @@ -210,8 +212,8 @@ class CustomAnimationListEntryItem : public SvLBoxString public: CustomAnimationListEntryItem( SvLBoxEntry*,sal_uInt16 nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent ); virtual ~CustomAnimationListEntryItem(); - void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* ); - void Paint( const Point&, SvLBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* ); + void InitViewData( SvTreeListBox*,SvLBoxEntry*,SvViewDataItem* ); + void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* ); SvLBoxItem* Create() const; void Clone( SvLBoxItem* pSource ); @@ -239,7 +241,7 @@ CustomAnimationListEntryItem::~CustomAnimationListEntryItem() // -------------------------------------------------------------------- -void CustomAnimationListEntryItem::InitViewData( SvLBox* pView, SvLBoxEntry* pEntry, SvViewDataItem* pViewData ) +void CustomAnimationListEntryItem::InitViewData( SvTreeListBox* pView, SvLBoxEntry* pEntry, SvViewDataItem* pViewData ) { if( !pViewData ) pViewData = pView->GetViewDataItem( pEntry, this ); @@ -252,7 +254,7 @@ void CustomAnimationListEntryItem::InitViewData( SvLBox* pView, SvLBoxEntry* pEn // -------------------------------------------------------------------- -void CustomAnimationListEntryItem::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* pEntry ) +void CustomAnimationListEntryItem::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* pEntry ) { SvViewDataItem* pViewData = mpParent->GetViewDataItem( pEntry, this ); @@ -361,8 +363,8 @@ public: CustomAnimationTriggerEntryItem( SvLBoxEntry*,sal_uInt16 nFlags, OUString aDescription ); virtual ~CustomAnimationTriggerEntryItem(); virtual sal_uInt16 IsA(); - void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* ); - void Paint( const Point&, SvLBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* ); + void InitViewData( SvTreeListBox*,SvLBoxEntry*,SvViewDataItem* ); + void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* ); SvLBoxItem* Create() const; void Clone( SvLBoxItem* pSource ); @@ -392,7 +394,7 @@ sal_uInt16 CustomAnimationTriggerEntryItem::IsA() // -------------------------------------------------------------------- -void CustomAnimationTriggerEntryItem::InitViewData( SvLBox* pView, SvLBoxEntry* pEntry, SvViewDataItem* pViewData ) +void CustomAnimationTriggerEntryItem::InitViewData( SvTreeListBox* pView, SvLBoxEntry* pEntry, SvViewDataItem* pViewData ) { if( !pViewData ) pViewData = pView->GetViewDataItem( pEntry, this ); @@ -405,7 +407,7 @@ void CustomAnimationTriggerEntryItem::InitViewData( SvLBox* pView, SvLBoxEntry* // -------------------------------------------------------------------- -void CustomAnimationTriggerEntryItem::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* ) +void CustomAnimationTriggerEntryItem::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* ) { Size aSize( rDev.GetOutputSizePixel().Width(), static_cast< SvTreeListBox* >(&rDev)->GetEntryHeight() ); diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index 914e29e685d7..693d6e3422dc 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -30,7 +30,7 @@ #define _SD_CUSTOMANIMATIONLIST_HXX #include -#include +#include #include #include "CustomAnimationPreset.hxx" #include "CustomAnimation.hrc" diff --git a/sd/source/ui/dlg/RemoteDialog.hxx b/sd/source/ui/dlg/RemoteDialog.hxx index 3ef7de15d53d..bc4831bd4ab6 100644 --- a/sd/source/ui/dlg/RemoteDialog.hxx +++ b/sd/source/ui/dlg/RemoteDialog.hxx @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include "RemoteDialogClientBox.hxx" diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index 321605ee59d2..c5dcc2c70a30 100644 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -38,6 +38,7 @@ #include "res_bmp.hrc" #include +#include "svtools/svlbitm.hxx" #include "dlgassim.hxx" diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx index aec9c1d8ce31..f6f9b792bf35 100644 --- a/sd/source/ui/dlg/dlgassim.hxx +++ b/sd/source/ui/dlg/dlgassim.hxx @@ -29,7 +29,7 @@ #include #include "drawdoc.hxx" #include -#include +#include #include "sdresid.hxx" diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index 774497664932..a176707e9912 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include class SdDrawDocument; diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 63ac738498e5..21d89c9a6705 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -35,7 +35,7 @@ #include "pres.hxx" #include "sddllapi.h" #include -#include +#include #include #include #include "sdxfer.hxx" @@ -223,7 +223,7 @@ public: sal_Bool IsLinkableSelected() const { return mbLinkableSelected; } static sal_Bool IsInDrag(); - using SvLBox::ExecuteDrop; + using SvTreeListBox::ExecuteDrop; using SvTreeListBox::SelectEntry; private: -- cgit