summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-03-18 11:02:37 +0200
committerNoel Grandin <noel@peralex.com>2016-03-18 11:03:00 +0200
commit0008c67004d3eb8e1fc7a5e13cd50269ba80e7d2 (patch)
treef366492e90770d9a2c5bfcc8e2f38eae01095e72 /svtools
parentf1ff9375184607b86ae8807d7cf1220962425b51 (diff)
drop unused params from SvLBoxItem and all it's subclasses
looks like this is fallout from commit ac7acb0a "Merged SvTreeListBox and SvLBox." (in year 2012) Change-Id: Iaebeae64fc7cd3ba11f5f45b53bcb65bf906e906
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/contnr/svlbitm.cxx16
-rw-r--r--svtools/source/contnr/svtabbx.cxx2
-rw-r--r--svtools/source/contnr/treelistbox.cxx10
-rw-r--r--svtools/source/uno/treecontrolpeer.cxx20
4 files changed, 15 insertions, 33 deletions
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 67192f6664a4..9690e664bf23 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -167,8 +167,7 @@ bool SvLBoxButtonData::IsRadio() {
// ***************************************************************
-SvLBoxString::SvLBoxString(SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rStr)
- : SvLBoxItem(pEntry, nFlags)
+SvLBoxString::SvLBoxString(const OUString& rStr)
{
SetText(rStr);
}
@@ -286,10 +285,9 @@ void SvLBoxBmp::Clone( SvLBoxItem* pSource )
// ***************************************************************
-SvLBoxButton::SvLBoxButton( SvTreeListEntry* pEntry, SvLBoxButtonKind eTheKind,
- sal_uInt16 nFlags, SvLBoxButtonData* pBData )
- : SvLBoxItem( pEntry, nFlags )
- , isVis(true)
+SvLBoxButton::SvLBoxButton( SvLBoxButtonKind eTheKind,
+ SvLBoxButtonData* pBData )
+ : isVis(true)
, pData(pBData)
, eKind(eTheKind)
, nItemFlags(SvItemStateFlags::NONE)
@@ -447,11 +445,9 @@ struct SvLBoxContextBmp_Impl
// ***************************************************************
-SvLBoxContextBmp::SvLBoxContextBmp(
- SvTreeListEntry* pEntry, sal_uInt16 nItemFlags, Image aBmp1, Image aBmp2,
+SvLBoxContextBmp::SvLBoxContextBmp(Image aBmp1, Image aBmp2,
bool bExpanded)
- :SvLBoxItem( pEntry, nItemFlags )
- ,m_pImpl( new SvLBoxContextBmp_Impl )
+ :m_pImpl( new SvLBoxContextBmp_Impl )
{
m_pImpl->m_bExpanded = bExpanded;
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index ba6e99b36ced..cb35cfa3a212 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -83,7 +83,7 @@ void SvTabListBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr,
for( sal_uInt16 nToken = 0; nToken < nCount; nToken++ )
{
const OUString aToken = GetToken(aCurEntry, nIndex);
- pEntry->AddItem(o3tl::make_unique<SvLBoxString>(pEntry, 0, aToken));
+ pEntry->AddItem(o3tl::make_unique<SvLBoxString>(aToken));
}
}
SvTabListBox::SvTabListBox( vcl::Window* pParent, WinBits nBits )
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index a20724e64550..40127142d607 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -327,10 +327,6 @@ long SvLBoxTab::CalcOffset( long nItemWidth, long nTabWidth )
// ***************************************************************
-SvLBoxItem::SvLBoxItem( SvTreeListEntry*, sal_uInt16 )
-{
-}
-
SvLBoxItem::SvLBoxItem()
{
}
@@ -1724,12 +1720,12 @@ void SvTreeListBox::InitEntry(SvTreeListEntry* pEntry,
{
if( nTreeFlags & SvTreeFlags::CHKBTN )
{
- pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(pEntry, eButtonKind, 0, pCheckButtonData));
+ pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(eButtonKind, pCheckButtonData));
}
- pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>( pEntry,0, aCollEntryBmp,aExpEntryBmp, mbContextBmpExpanded));
+ pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>( aCollEntryBmp,aExpEntryBmp, mbContextBmpExpanded));
- pEntry->AddItem(o3tl::make_unique<SvLBoxString>(pEntry, 0, aStr));
+ pEntry->AddItem(o3tl::make_unique<SvLBoxString>(aStr));
}
OUString SvTreeListBox::GetEntryText(SvTreeListEntry* pEntry) const
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 1403ed538051..95323fe6c8ab 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -71,8 +71,8 @@ public:
class ImplContextGraphicItem : public SvLBoxContextBmp
{
public:
- ImplContextGraphicItem( SvTreeListEntry* pEntry,sal_uInt16 nFlags,Image& rI1,Image& rI2, bool bExpanded)
- : SvLBoxContextBmp(pEntry, nFlags, rI1, rI2, bExpanded) {}
+ ImplContextGraphicItem( Image& rI1,Image& rI2, bool bExpanded)
+ : SvLBoxContextBmp(rI1, rI2, bExpanded) {}
OUString msExpandedGraphicURL;
OUString msCollapsedGraphicURL;
@@ -105,7 +105,6 @@ private:
class UnoTreeListItem : public SvLBoxString
{
public:
- explicit UnoTreeListItem( SvTreeListEntry* );
UnoTreeListItem();
virtual ~UnoTreeListItem();
void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) override;
@@ -225,12 +224,9 @@ UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xN
{
Image aImage;
pEntry = new UnoTreeListEntry( xNode, this );
- {
-
- pEntry->AddItem(o3tl::make_unique<ImplContextGraphicItem>(pEntry, 0, aImage, aImage, true));
- }
+ pEntry->AddItem(o3tl::make_unique<ImplContextGraphicItem>(aImage, aImage, true));
- std::unique_ptr<UnoTreeListItem> pUnoItem(new UnoTreeListItem(pEntry));
+ std::unique_ptr<UnoTreeListItem> pUnoItem(new UnoTreeListItem);
if( !xNode->getNodeGraphicURL().isEmpty() )
{
@@ -1510,14 +1506,8 @@ bool UnoTreeListBoxImpl::EditedEntry( SvTreeListEntry* pEntry, const OUString& r
// class UnoTreeListItem
-UnoTreeListItem::UnoTreeListItem( SvTreeListEntry* pEntry )
-: SvLBoxString(pEntry, 0, OUString())
-{
-}
-
-
UnoTreeListItem::UnoTreeListItem()
-: SvLBoxString()
+: SvLBoxString(OUString())
{
}