summaryrefslogtreecommitdiff
path: root/svx/source
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 /svx/source
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 'svx/source')
-rw-r--r--svx/source/dialog/ctredlin.cxx15
-rw-r--r--svx/source/dialog/docrecovery.cxx8
-rw-r--r--svx/source/dialog/fontlb.cxx11
-rw-r--r--svx/source/form/filtnav.cxx12
-rw-r--r--svx/source/inc/docrecovery.hxx5
5 files changed, 22 insertions, 29 deletions
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 839159ec8809..fba5c46dd6a4 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -57,9 +57,8 @@ SvxRedlinEntry::~SvxRedlinEntry()
delete pRedDat;
}
-SvLBoxColorString::SvLBoxColorString(SvTreeListEntry*pEntry, sal_uInt16 nFlags, const OUString& rStr,
- const Color& rCol)
- : SvLBoxString(pEntry, nFlags, rStr)
+SvLBoxColorString::SvLBoxColorString(const OUString& rStr, const Color& rCol)
+ : SvLBoxString(rStr)
{
aPrivColor=rCol;
SetText( rStr );
@@ -337,21 +336,21 @@ void SvxRedlinTable::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr,
if (nTreeFlags & SvTreeFlags::CHKBTN)
{
pEntry->AddItem(std::unique_ptr<SvLBoxButton>(
- new SvLBoxButton(pEntry, eButtonKind, 0, pCheckButtonData)));
+ new SvLBoxButton(eButtonKind, pCheckButtonData)));
}
pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(
- new SvLBoxContextBmp(pEntry, 0, rColl, rExp, true)));
+ new SvLBoxContextBmp(rColl, rExp, true)));
// the type of the change
assert((rStr.isEmpty() && !!maEntryImage) || (!rStr.isEmpty() && !maEntryImage));
if (rStr.isEmpty())
pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(new SvLBoxContextBmp(
- pEntry, 0, maEntryImage, maEntryImage, true)));
+ maEntryImage, maEntryImage, true)));
else
pEntry->AddItem(std::unique_ptr<SvLBoxColorString>(
- new SvLBoxColorString(pEntry, 0, rStr, maEntryColor)));
+ new SvLBoxColorString(rStr, maEntryColor)));
// the change tracking entries
sal_Int32 nIndex = 0;
@@ -360,7 +359,7 @@ void SvxRedlinTable::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr,
{
const OUString aToken = GetToken(maEntryString, nIndex);
pEntry->AddItem(std::unique_ptr<SvLBoxColorString>(
- new SvLBoxColorString(pEntry, 0, aToken, maEntryColor)));
+ new SvLBoxColorString(aToken, maEntryColor)));
}
}
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index fe3432669c02..08e9944b60d4 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -756,10 +756,8 @@ void SaveProgressDialog::end()
}
-RecovDocListEntry::RecovDocListEntry( SvTreeListEntry* pEntry,
- sal_uInt16 nFlags,
- const OUString& sText )
- : SvLBoxString( pEntry, nFlags, sText )
+RecovDocListEntry::RecovDocListEntry( const OUString& sText )
+ : SvLBoxString( sText )
{
}
@@ -845,7 +843,7 @@ void RecovDocList::InitEntry(SvTreeListEntry* pEntry,
DBG_ASSERT( TabCount() == 2, "*RecovDocList::InitEntry(): structure missmatch" );
SvLBoxString& rCol = static_cast<SvLBoxString&>(pEntry->GetItem(2));
- pEntry->ReplaceItem(o3tl::make_unique<RecovDocListEntry>(pEntry, 0, rCol.GetText()), 2);
+ pEntry->ReplaceItem(o3tl::make_unique<RecovDocListEntry>(rCol.GetText()), 2);
}
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index 87a482de4568..65f41e2e6649 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -30,10 +30,9 @@ SvLBoxFontString::SvLBoxFontString()
{
}
-SvLBoxFontString::SvLBoxFontString(
- SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rString,
+SvLBoxFontString::SvLBoxFontString( const OUString& rString,
const vcl::Font& rFont, const Color* pColor ) :
- SvLBoxString( pEntry, nFlags, rString ),
+ SvLBoxString( rString ),
maFont( rFont ),
mbUseColor( pColor != nullptr )
{
@@ -135,11 +134,11 @@ void SvxFontListBox::InitEntry(
{
if( nTreeFlags & SvTreeFlags::CHKBTN )
pEntry->AddItem(std::unique_ptr<SvLBoxButton>(new SvLBoxButton(
- pEntry, eButtonKind, 0, pCheckButtonData)));
+ eButtonKind, pCheckButtonData)));
pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(new SvLBoxContextBmp(
- pEntry, 0, rCollImg, rExpImg, true)));
+ rCollImg, rExpImg, true)));
pEntry->AddItem(std::unique_ptr<SvLBoxFontString>(new SvLBoxFontString(
- pEntry, 0, rEntryText, maEntryFont, mpEntryColor)));
+ rEntryText, maEntryFont, mpEntryColor)));
}
else
SvTreeListBox::InitEntry( pEntry, rEntryText, rCollImg, rExpImg,
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index db205700c694..f24ca92c7616 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -984,8 +984,8 @@ void FmFilterModel::EnsureEmptyFilterRows( FmParentData& _rItem )
class FmFilterItemsString : public SvLBoxString
{
public:
- FmFilterItemsString( SvTreeListEntry* pEntry, const OUString& rStr )
- :SvLBoxString(pEntry,0,rStr){}
+ FmFilterItemsString( const OUString& rStr )
+ :SvLBoxString(rStr) {}
virtual void Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext,
const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override;
@@ -1041,8 +1041,8 @@ class FmFilterString : public SvLBoxString
OUString m_aName;
public:
- FmFilterString( SvTreeListEntry* pEntry, const OUString& rStr, const OUString& aName)
- : SvLBoxString(pEntry,0,rStr)
+ FmFilterString( const OUString& rStr, const OUString& aName)
+ : SvLBoxString(rStr)
, m_aName(aName)
{
m_aName += ": ";
@@ -1386,10 +1386,10 @@ void FmFilterNavigator::InitEntry(SvTreeListEntry* pEntry,
std::unique_ptr<SvLBoxString> pString;
if (dynamic_cast<const FmFilterItem*>(static_cast<FmFilterData*>(pEntry->GetUserData())) != nullptr)
- pString.reset(new FmFilterString(pEntry, rStr,
+ pString.reset(new FmFilterString(rStr,
static_cast<FmFilterItem*>(pEntry->GetUserData())->GetFieldName()));
else if (dynamic_cast<const FmFilterItems*>(static_cast<FmFilterData*>(pEntry->GetUserData())) != nullptr)
- pString.reset(new FmFilterItemsString(pEntry, rStr));
+ pString.reset(new FmFilterItemsString(rStr));
if (pString)
pEntry->ReplaceItem(std::move(pString), 1 );
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 9160b0e1503b..62a624671035 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -445,11 +445,8 @@ class RecovDocListEntry : public SvLBoxString
{
public:
-
/** @short TODO */
- RecovDocListEntry( SvTreeListEntry* pEntry,
- sal_uInt16 nFlags,
- const OUString& sText );
+ RecovDocListEntry( const OUString& sText );
/** @short TODO */