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

39 files changed, 179 insertions, 260 deletions

diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index a8ee608dad0f..58fda39bc18c 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -111,8 +111,8 @@ public:
 class LibLBoxString : public SvLBoxString
 {
 public:
-    LibLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rTxt ) :
-        SvLBoxString( pEntry, nFlags, rTxt ) {}
+    LibLBoxString( const OUString& rTxt ) :
+        SvLBoxString( rTxt ) {}
 
     virtual void Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext,
                        const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override;
@@ -253,7 +253,7 @@ void CheckBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rTxt,
         for ( sal_uInt16 nCol = 1; nCol < nCount; ++nCol )
         {
             SvLBoxString& rCol = static_cast<SvLBoxString&>(pEntry->GetItem( nCol ));
-            pEntry->ReplaceItem(o3tl::make_unique<LibLBoxString>( pEntry, 0, rCol.GetText() ), nCol);
+            pEntry->ReplaceItem(o3tl::make_unique<LibLBoxString>( rCol.GetText() ), nCol);
         }
     }
 }
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index f94988db63f9..c32a4d3873e8 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -634,7 +634,7 @@ static long AccCfgTabs[] =
 class SfxAccCfgLBoxString_Impl : public SvLBoxString
 {
 public:
-    SfxAccCfgLBoxString_Impl(SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& sText);
+    SfxAccCfgLBoxString_Impl(const OUString& sText);
 
     virtual ~SfxAccCfgLBoxString_Impl();
 
@@ -643,8 +643,8 @@ public:
 };
 
 
-SfxAccCfgLBoxString_Impl::SfxAccCfgLBoxString_Impl(SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& sText)
-    : SvLBoxString(pEntry, nFlags, sText)
+SfxAccCfgLBoxString_Impl::SfxAccCfgLBoxString_Impl(const OUString& sText)
+    : SvLBoxString(sText)
 {}
 
 SfxAccCfgLBoxString_Impl::~SfxAccCfgLBoxString_Impl()
@@ -925,10 +925,8 @@ void SfxAcceleratorConfigPage::CreateCustomItems(SvTreeListEntry* pEntry,
                                                  const OUString& sCol1 ,
                                                  const OUString& sCol2)
 {
-
-    pEntry->ReplaceItem(o3tl::make_unique<SfxAccCfgLBoxString_Impl>(pEntry, 0, sCol1), 1);
-
-    pEntry->ReplaceItem(o3tl::make_unique<SfxAccCfgLBoxString_Impl>(pEntry, 0, sCol2), 2);
+    pEntry->ReplaceItem(o3tl::make_unique<SfxAccCfgLBoxString_Impl>(sCol1), 1);
+    pEntry->ReplaceItem(o3tl::make_unique<SfxAccCfgLBoxString_Impl>(sCol2), 2);
 }
 
 
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index c238dc7121c8..6aa6838a9967 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -64,6 +64,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/random.hxx>
 #include <unotools/configmgr.hxx>
+#include <o3tl/make_unique.hxx>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/FileSystemStorageFactory.hpp>
 #include <com/sun/star/frame/XFramesSupplier.hpp>
@@ -1554,8 +1555,8 @@ void ContextMenuSaveInData::Reset()
 class PopupPainter : public SvLBoxString
 {
 public:
-    PopupPainter( SvTreeListEntry* pEntry, const OUString& rStr )
-        : SvLBoxString( pEntry, 0, rStr )
+    PopupPainter( const OUString& rStr )
+        : SvLBoxString( rStr )
     { }
 
     virtual ~PopupPainter() { }
@@ -2335,9 +2336,7 @@ SvTreeListEntry* SvxConfigPage::InsertEntryIntoUI(
              pNewEntryData->GetStyle() & css::ui::ItemStyle::DROP_DOWN )
         {
             // add new popup painter, it gets destructed by the entry
-            pNewEntry->ReplaceItem(
-                std::unique_ptr<PopupPainter>(new PopupPainter(pNewEntry, aName)),
-                pNewEntry->ItemCount() - 1 );
+            pNewEntry->ReplaceItem( o3tl::make_unique<PopupPainter>(aName), pNewEntry->ItemCount() - 1 );
         }
     }
 
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 8b1bbc021b16..6e7c2dedcfa8 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -41,6 +41,7 @@
 #include <svx/dialogs.hrc>
 #include <vcl/builderfactory.hxx>
 #include <comphelper/namedvaluecollection.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <algorithm>
 #include <iterator>
@@ -446,16 +447,15 @@ class IconLBoxString : public SvLBoxString
     int m_nxImageOffset;
 
 public:
-    IconLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& sText,
-        Image* pMacroImg, Image* pComponentImg );
+    IconLBoxString( const OUString& sText, Image* pMacroImg, Image* pComponentImg );
     virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext,
                        const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override;
 };
 
 
-IconLBoxString::IconLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& sText,
+IconLBoxString::IconLBoxString( const OUString& sText,
     Image* pMacroImg, Image* pComponentImg )
-        : SvLBoxString( pEntry, nFlags, sText )
+        : SvLBoxString( sText )
         , m_pMacroImg( pMacroImg )
         , m_pComponentImg( pComponentImg )
 {
@@ -552,8 +552,7 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
         OUString* pEventName = new OUString( sEventName );
         _pE->SetUserData( static_cast<void*>(pEventName) );
         OUString sNew( eventURL );
-        _pE->ReplaceItem(std::unique_ptr<IconLBoxString>(new IconLBoxString(
-                _pE, 0, sNew, &mpImpl->aMacroImg, &mpImpl->aComponentImg)),
+        _pE->ReplaceItem(o3tl::make_unique<IconLBoxString>(sNew, &mpImpl->aMacroImg, &mpImpl->aComponentImg),
             LB_MACROS_ITEMPOS );
         rListBox.GetModel()->InvalidateEntry( _pE );
         rListBox.Select( _pE );
@@ -699,8 +698,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
 
     // update the listbox entry
     pImpl->pEventLB->SetUpdateMode( false );
-    pE->ReplaceItem(std::unique_ptr<IconLBoxString>(new IconLBoxString(
-                pE, 0, sEventURL, &pImpl->aMacroImg, &pImpl->aComponentImg)),
+    pE->ReplaceItem(o3tl::make_unique<IconLBoxString>(sEventURL, &pImpl->aMacroImg, &pImpl->aComponentImg),
         LB_MACROS_ITEMPOS );
 
     rListBox.GetModel()->InvalidateEntry( pE );
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 556de064cd19..3e95c310e34f 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -43,6 +43,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <osl/file.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <stack>
 #include <algorithm>
@@ -137,11 +138,8 @@ void ReplaceEdit::SetText( const OUString& rStr, const Selection& rNewSelection
 
 // class ThesaurusAlternativesCtrl ----------------------------------
 
-AlternativesString::AlternativesString(
-    ThesaurusAlternativesCtrl &rControl,
-    SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rStr ) :
-
-    SvLBoxString( pEntry, nFlags, rStr ),
+AlternativesString::AlternativesString( ThesaurusAlternativesCtrl &rControl, const OUString& rStr ) :
+    SvLBoxString( rStr ),
     m_rControlImpl( rControl )
 {
 }
@@ -230,13 +228,10 @@ SvTreeListEntry * ThesaurusAlternativesCtrl::AddEntry( sal_Int32 nVal, const OUS
     {
         aText = OUString::number( nVal ) + ". ";
     }
-    pEntry->AddItem(std::unique_ptr<SvLBoxString>(
-        new SvLBoxString(pEntry, 0, OUString()))); // add empty column
+    pEntry->AddItem(o3tl::make_unique<SvLBoxString>(OUString())); // add empty column
     aText += rText;
-    pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(
-        new SvLBoxContextBmp(pEntry, 0, Image(), Image(), false))); // otherwise crash
-    pEntry->AddItem(std::unique_ptr<AlternativesString>(
-        new AlternativesString( *this, pEntry, 0, aText)));
+    pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false)); // otherwise crash
+    pEntry->AddItem(o3tl::make_unique<AlternativesString>(*this, aText));
 
     SetExtraData( pEntry, AlternativesExtraData( rText, bIsHeader ) );
     GetModel()->Insert( pEntry );
diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx
index 2546ecc5844b..fb529346de18 100644
--- a/cui/source/dialogs/thesdlg_impl.hxx
+++ b/cui/source/dialogs/thesdlg_impl.hxx
@@ -50,8 +50,7 @@ class AlternativesString : public SvLBoxString
     ThesaurusAlternativesCtrl&    m_rControlImpl;
 public:
 
-    AlternativesString( ThesaurusAlternativesCtrl &rControl,
-        SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rStr );
+    AlternativesString( ThesaurusAlternativesCtrl &rControl, const OUString& rStr );
 
     virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext,
                        const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override;
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 3625d82722d5..c6f906902987 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -29,6 +29,7 @@
 #include <dialmgr.hxx>
 #include "helpid.hrc"
 #include <cuires.hrc>
+#include <o3tl/make_unique.hxx>
 
 /*********************************************************************/
 /*                                                                   */
@@ -123,18 +124,13 @@ SvTreeListEntry* SvxFontSubstTabPage::CreateEntry(OUString& rFont1, OUString& rF
     if( !pCheckButtonData )
         pCheckButtonData = new SvLBoxButtonData( m_pCheckLB );
 
-    pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(new SvLBoxContextBmp(
-            pEntry, 0, Image(), Image(), false))); // otherwise boom!
+    pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false)); // otherwise boom!
 
-    pEntry->AddItem(std::unique_ptr<SvLBoxButton>(new SvLBoxButton(pEntry,
-           SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData)));
-    pEntry->AddItem(std::unique_ptr<SvLBoxButton>(new SvLBoxButton(pEntry,
-           SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData)));
+    pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind_enabledCheckbox, pCheckButtonData));
+    pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind_enabledCheckbox, pCheckButtonData));
 
-    pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(
-                    pEntry, 0, rFont1)));
-    pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(
-                    pEntry, 0, rFont2)));
+    pEntry->AddItem(o3tl::make_unique<SvLBoxString>(rFont1));
+    pEntry->AddItem(o3tl::make_unique<SvLBoxString>(rFont2));
 
     return pEntry;
 }
diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx
index e5e274ff8864..5a6039b42ac2 100644
--- a/cui/source/options/optHeaderTabListbox.cxx
+++ b/cui/source/options/optHeaderTabListbox.cxx
@@ -31,8 +31,8 @@ namespace svx
 class OptLBoxString_Impl : public SvLBoxString
 {
 public:
-    OptLBoxString_Impl( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rTxt ) :
-        SvLBoxString( pEntry, nFlags, rTxt ) {}
+    OptLBoxString_Impl( const OUString& rTxt ) :
+        SvLBoxString( rTxt ) {}
 
     virtual void Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext,
                        const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override;
@@ -70,7 +70,7 @@ void OptHeaderTabListBox::InitEntry( SvTreeListEntry* pEntry, const OUString& rT
     {
         // initialize all columns with own class (column 0 == Bitmap)
         SvLBoxString& rCol = static_cast<SvLBoxString&>(pEntry->GetItem( nCol ));
-        pEntry->ReplaceItem(o3tl::make_unique<OptLBoxString_Impl>(pEntry, 0, rCol.GetText()), nCol);
+        pEntry->ReplaceItem(o3tl::make_unique<OptLBoxString_Impl>(rCol.GetText()), nCol);
     }
 }
 
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 94e46864f1f0..112dbf294f61 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/util/SearchFlags.hpp>
 #include <com/sun/star/util/SearchAlgorithms2.hpp>
 #include <unotools/textsearch.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <vector>
 #include <iostream>
@@ -204,11 +205,11 @@ void CuiAboutConfigTabPage::InsertEntry(const OUString& rPropertyPath, const OUS
 {
     SvTreeListEntry* pEntry = new SvTreeListEntry;
     pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(
-        new SvLBoxContextBmp( pEntry, 0, Image(), Image(), false))); //It is needed, otherwise causes crash
-    pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(pEntry, 0, rProp)));
-    pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(pEntry, 0, rStatus)));
-    pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(pEntry, 0, rType)));
-    pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(pEntry, 0, rValue)));
+        new SvLBoxContextBmp( Image(), Image(), false))); //It is needed, otherwise causes crash
+    pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(rProp)));
+    pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(rStatus)));
+    pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(rType)));
+    pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(rValue)));
     pEntry->SetUserData( new UserData(rPropertyPath) );
 
     if(bInsertToPrefBox)
@@ -281,18 +282,14 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces
             {
                 // not leaf node
                 SvTreeListEntry* pEntry = new SvTreeListEntry;
-                pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(
-                    new SvLBoxContextBmp(pEntry, 0, SvTreeListBox::GetDefaultExpandedNodeImage(),
-                       SvTreeListBox::GetDefaultCollapsedNodeImage(), false)));
-                pEntry->AddItem(std::unique_ptr<SvLBoxString>(
-                    new SvLBoxString( pEntry, 0, seqItems[i])));
+                pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(
+                    SvTreeListBox::GetDefaultExpandedNodeImage(),
+                    SvTreeListBox::GetDefaultCollapsedNodeImage(), false));
+                pEntry->AddItem(o3tl::make_unique<SvLBoxString>(seqItems[i]));
                 //It is needed, without this the selection line will be truncated.
-                pEntry->AddItem(std::unique_ptr<SvLBoxString>(
-                    new SvLBoxString( pEntry, 0, "")));
-                pEntry->AddItem(std::unique_ptr<SvLBoxString>(
-                    new SvLBoxString( pEntry, 0, "")));
-                pEntry->AddItem(std::unique_ptr<SvLBoxString>(
-                    new SvLBoxString( pEntry, 0, "")));
+                pEntry->AddItem(o3tl::make_unique<SvLBoxString>(""));
+                pEntry->AddItem(o3tl::make_unique<SvLBoxString>(""));
+                pEntry->AddItem(o3tl::make_unique<SvLBoxString>(""));
 
                 pEntry->SetUserData( new UserData(xNextNameAccess, lineage + 1) );
                 pEntry->EnableChildrenOnDemand();
@@ -780,8 +777,7 @@ IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void )
                 );
                 if (it != m_prefBoxEntries.end())
                 {
-                    (*it)->ReplaceItem(std::unique_ptr<SvLBoxString>(
-                        new SvLBoxString( (*it).get(), 0, sDialogValue)), 4);
+                    (*it)->ReplaceItem(o3tl::make_unique<SvLBoxString>(sDialogValue), 4);
 
                     SvTreeListEntries::iterator modifiedIt = std::find_if(
                                 m_modifiedPrefBoxEntries.begin(), m_modifiedPrefBoxEntries.end(),
@@ -794,9 +790,7 @@ IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void )
 
                     if( modifiedIt != m_modifiedPrefBoxEntries.end())
                     {
-                        (*modifiedIt)->ReplaceItem(std::unique_ptr<SvLBoxString>(
-                            new SvLBoxString((*modifiedIt).get(), 0, sDialogValue)),
-                            4);
+                        (*modifiedIt)->ReplaceItem(o3tl::make_unique<SvLBoxString>(sDialogValue), 4);
                     }
                     else
                     {
@@ -890,18 +884,14 @@ void CuiAboutConfigTabPage::InsertEntry( SvTreeListEntry *pEntry)
         if(!hasEntry)
         {
             pParentEntry = new SvTreeListEntry;
-            pParentEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(
-                new SvLBoxContextBmp(pParentEntry, 0, SvTreeListBox::GetDefaultExpandedNodeImage(),
-                   SvTreeListBox::GetDefaultCollapsedNodeImage(), false)));
-            pParentEntry->AddItem(std::unique_ptr<SvLBoxString>(
-                new SvLBoxString(pParentEntry, 0, sParentName)));
+            pParentEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(
+                   SvTreeListBox::GetDefaultExpandedNodeImage(),
+                   SvTreeListBox::GetDefaultCollapsedNodeImage(), false));
+            pParentEntry->AddItem(o3tl::make_unique<SvLBoxString>(sParentName));
             //It is needed, without this the selection line will be truncated.
-            pParentEntry->AddItem(std::unique_ptr<SvLBoxString>(
-                new SvLBoxString(pParentEntry, 0, "")));
-            pParentEntry->AddItem(std::unique_ptr<SvLBoxString>(
-                new SvLBoxString(pParentEntry, 0, "")));
-            pParentEntry->AddItem(std::unique_ptr<SvLBoxString>(
-                new SvLBoxString( pParentEntry, 0, "")));
+            pParentEntry->AddItem(o3tl::make_unique<SvLBoxString>(""));
+            pParentEntry->AddItem(o3tl::make_unique<SvLBoxString>(""));
+            pParentEntry->AddItem(o3tl::make_unique<SvLBoxString>(""));
             pParentEntry->EnableChildrenOnDemand(false);
             m_pPrefBox->Insert( pParentEntry, pGrandParentEntry );
         }
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index b990d188e0ef..03262fb2bb53 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -337,16 +337,16 @@ void OfaMSFilterTabPage2::InsertEntry( const OUString& _rTxt, sal_IntPtr _nType,
         pCheckButtonData = new SvLBoxButtonData( m_pCheckLB );
 
     pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(
-        new SvLBoxContextBmp(pEntry, 0, Image(), Image(), false)));
+        new SvLBoxContextBmp(Image(), Image(), false)));
     pEntry->AddItem(std::unique_ptr<SvLBoxButton>(
-        new SvLBoxButton(pEntry, loadEnabled ? SvLBoxButtonKind_enabledCheckbox
-                                             : SvLBoxButtonKind_disabledCheckbox,
-               0, pCheckButtonData)));
+        new SvLBoxButton(loadEnabled ? SvLBoxButtonKind_enabledCheckbox
+                                     : SvLBoxButtonKind_disabledCheckbox,
+               pCheckButtonData)));
     pEntry->AddItem(std::unique_ptr<SvLBoxButton>(
-        new SvLBoxButton(pEntry, saveEnabled ? SvLBoxButtonKind_enabledCheckbox
-                                             : SvLBoxButtonKind_disabledCheckbox,
-               0, pCheckButtonData)));
-    pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(pEntry, 0, _rTxt)));
+        new SvLBoxButton(saveEnabled ? SvLBoxButtonKind_enabledCheckbox
+                                     : SvLBoxButtonKind_disabledCheckbox,
+               pCheckButtonData)));
+    pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(_rTxt)));
 
     pEntry->SetUserData( reinterpret_cast<void*>(_nType) );
     m_pCheckLB->Insert( pEntry );
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index cdf0b3237283..e25312724918 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -30,6 +30,7 @@
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/dispatch.hxx>
 #include <tools/urlobj.hxx>
+#include <o3tl/make_unique.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/linguistic2/LinguServiceManager.hpp>
@@ -259,8 +260,7 @@ class BrwStringDic_Impl : public SvLBoxString
 {
 public:
 
-    BrwStringDic_Impl( SvTreeListEntry* pEntry, sal_uInt16 nFlags,
-        const OUString& rStr ) : SvLBoxString( pEntry, nFlags, rStr ) {}
+    BrwStringDic_Impl( const OUString& rStr ) : SvLBoxString( rStr ) {}
 
     virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext,
                        const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override;
@@ -436,8 +436,7 @@ class BrwString_Impl : public SvLBoxString
 {
 public:
 
-    BrwString_Impl( SvTreeListEntry* pEntry, sal_uInt16 nFlags,
-        const OUString& rStr ) : SvLBoxString( pEntry, nFlags, rStr ) {}
+    BrwString_Impl( const OUString& rStr ) : SvLBoxString( rStr ) {}
 
     virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext,
                        const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override;
@@ -1784,15 +1783,11 @@ SvTreeListEntry* SvxLinguTabPage::CreateEntry( OUString& rTxt, sal_uInt16 nCol )
         pCheckButtonData = new SvLBoxButtonData(m_pLinguOptionsCLB);
 
     if (CBCOL_FIRST == nCol)
-        pEntry->AddItem(std::unique_ptr<SvLBoxButton>(new SvLBoxButton(
-            pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData)));
+        pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind_enabledCheckbox, pCheckButtonData));
     if (CBCOL_SECOND == nCol)
-        pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(
-            pEntry, 0, "")));    // empty column
-    pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(new SvLBoxContextBmp(
-            pEntry, 0, Image(), Image(), false)));
-    pEntry->AddItem(std::unique_ptr<BrwString_Impl>(new BrwString_Impl(
-            pEntry, 0, rTxt)));
+        pEntry->AddItem(o3tl::make_unique<SvLBoxString>(""));    // empty column
+    pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false));
+    pEntry->AddItem(o3tl::make_unique<BrwString_Impl>(rTxt));
 
     return pEntry;
 }
@@ -1917,11 +1912,11 @@ SvTreeListEntry* SvxEditModulesDlg::CreateEntry( OUString& rTxt, sal_uInt16 nCol
     }
 
     if (CBCOL_FIRST == nCol)
-        pEntry->AddItem(std::unique_ptr<SvLBoxButton>(new SvLBoxButton(pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData)));
+        pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind_enabledCheckbox, pCheckButtonData));
     if (CBCOL_SECOND == nCol)
-        pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(pEntry, 0, "")));    // empty column
-    pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(new SvLBoxContextBmp( pEntry, 0, Image(), Image(), false)));
-    pEntry->AddItem(std::unique_ptr<BrwStringDic_Impl>(new BrwStringDic_Impl(pEntry, 0, rTxt)));
+        pEntry->AddItem(o3tl::make_unique<SvLBoxString>(""));    // empty column
+    pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false));
+    pEntry->AddItem(o3tl::make_unique<BrwStringDic_Impl>(rTxt));
 
     return pEntry;
 }
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 33c6d4cef3f6..e5b29cfe6814 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -45,6 +45,7 @@
 #include <com/sun/star/smarttags/XSmartTagRecognizer.hpp>
 #include <com/sun/star/smarttags/XSmartTagAction.hpp>
 #include <rtl/strbuf.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include "autocdlg.hxx"
 #include "helpid.hrc"
@@ -329,8 +330,7 @@ class OfaImpBrwString : public SvLBoxString
 {
 public:
 
-    OfaImpBrwString( SvTreeListEntry* pEntry, sal_uInt16 nFlags,
-        const OUString& rStr ) : SvLBoxString(pEntry,nFlags,rStr){}
+    OfaImpBrwString( const OUString& rStr ) : SvLBoxString(rStr){}
 
     virtual void Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext,
                        const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override;
@@ -472,19 +472,18 @@ SvTreeListEntry* OfaSwAutoFmtOptionsPage::CreateEntry(OUString& rTxt, sal_uInt16
         m_pCheckLB->SetCheckButtonData( pCheckButtonData );
     }
 
-    pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(new SvLBoxContextBmp(
-                    pEntry, 0, Image(), Image(), false)));
+    pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false));
 
     if (nCol == CBCOL_SECOND)
-        pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(pEntry, 0, "")));
+        pEntry->AddItem(o3tl::make_unique<SvLBoxString>(""));
     else
-        pEntry->AddItem(std::unique_ptr<SvLBoxButton>(new SvLBoxButton(pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData)));
+        pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind_enabledCheckbox, pCheckButtonData));
 
     if (nCol == CBCOL_FIRST)
-        pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(pEntry, 0, "")));
+        pEntry->AddItem(o3tl::make_unique<SvLBoxString>(""));
     else
-        pEntry->AddItem(std::unique_ptr<SvLBoxButton>(new SvLBoxButton(pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData)));
-    pEntry->AddItem(std::unique_ptr<OfaImpBrwString>(new OfaImpBrwString( pEntry, 0, rTxt)));
+        pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind_enabledCheckbox, pCheckButtonData));
+    pEntry->AddItem(o3tl::make_unique<OfaImpBrwString>(rTxt));
 
     return pEntry;
 }
@@ -1802,21 +1801,19 @@ SvTreeListEntry* OfaQuoteTabPage::CreateEntry(OUString& rTxt, sal_uInt16 nCol)
         m_pSwCheckLB->SetCheckButtonData(pCheckButtonData);
     }
 
-    pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(
-                new SvLBoxContextBmp(pEntry, 0, Image(), Image(), false)));
+    pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false));
 
     if (nCol == CBCOL_SECOND)
-        pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(pEntry, 0, "")));
+        pEntry->AddItem(o3tl::make_unique<SvLBoxString>(""));
     else
-        pEntry->AddItem(std::unique_ptr<SvLBoxButton>(new SvLBoxButton(pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData)));
+        pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind_enabledCheckbox, pCheckButtonData));
 
     if (nCol == CBCOL_FIRST)
-        pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(pEntry, 0, "")));
+        pEntry->AddItem(o3tl::make_unique<SvLBoxString>(""));
     else
-        pEntry->AddItem(std::unique_ptr<SvLBoxButton>(new SvLBoxButton(
-            pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData)));
+        pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind_enabledCheckbox, pCheckButtonData));
 
-    pEntry->AddItem(std::unique_ptr<OfaImpBrwString>(new OfaImpBrwString(pEntry, 0, rTxt)));
+    pEntry->AddItem(o3tl::make_unique<OfaImpBrwString>(rTxt));
 
     return pEntry;
 }
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 5e599ae4788f..0100c8114998 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -35,6 +35,7 @@
 #include "headertablistbox.hxx"
 #include "svtools/svlbitm.hxx"
 #include "svtools/treelistentry.hxx"
+#include <o3tl/make_unique.hxx>
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::frame::XFrame;
@@ -340,7 +341,7 @@ bool _SfxMacroTabPage::AssignDeleteHdl(Control* pBtn)
     }
 
     mpImpl->pEventLB->SetUpdateMode( false );
-    pE->ReplaceItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(pE, 0, sScriptURI)), LB_MACROS_ITEMPOS);
+    pE->ReplaceItem(o3tl::make_unique<SvLBoxString>(sScriptURI), LB_MACROS_ITEMPOS);
     rListBox.GetModel()->InvalidateEntry( pE );
     rListBox.Select( pE );
     rListBox.MakeVisible( pE );
@@ -433,8 +434,7 @@ void _SfxMacroTabPage::FillEvents()
 
             if( sOld != sNew )
             {
-                pE->ReplaceItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(
-                                    pE, 0, sNew)), LB_MACROS_ITEMPOS);
+                pE->ReplaceItem(o3tl::make_unique<SvLBoxString>(sNew), LB_MACROS_ITEMPOS);
                 rListBox.GetModel()->InvalidateEntry( pE );
             }
         }
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index adcff3ee227c..2aa4a9b67dfa 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -139,7 +139,7 @@ void DBTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const OUString& aStr, co
 {
     SvTreeListBox::InitEntry( _pEntry, aStr, _rCollEntryBmp,_rExpEntryBmp, eButtonKind);
     SvLBoxItem* pTextItem(_pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
-    _pEntry->ReplaceItem(o3tl::make_unique<OBoldListboxString>(_pEntry, 0, aStr), _pEntry->GetPos(pTextItem));
+    _pEntry->ReplaceItem(o3tl::make_unique<OBoldListboxString>(aStr), _pEntry->GetPos(pTextItem));
 }
 
 void DBTreeListBox::implStopSelectionTimer()
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 5437a4e2718a..18887ded2c26 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -43,6 +43,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <connectivity/dbmetadata.hxx>
 #include "svtools/treelistentry.hxx"
+#include <o3tl/make_unique.hxx>
 
 #include <algorithm>
 
@@ -408,8 +409,7 @@ void OTableTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const OUString& _rSt
     size_t nTextPos = _pEntry->GetPos(pTextItem);
     OSL_ENSURE(SvTreeListEntry::ITEM_NOT_FOUND != nTextPos, "OTableTreeListBox::InitEntry: no text item pos!");
 
-    _pEntry->ReplaceItem(std::unique_ptr<OBoldListboxString>(
-                new OBoldListboxString(_pEntry, 0, _rString)), nTextPos);
+    _pEntry->ReplaceItem(o3tl::make_unique<OBoldListboxString>(_rString), nTextPos);
 }
 
 SvTreeListEntry* OTableTreeListBox::implAddEntry(
diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx
index 68e911776f5e..5244941adadf 100644
--- a/dbaccess/source/ui/inc/listviewitems.hxx
+++ b/dbaccess/source/ui/inc/listviewitems.hxx
@@ -33,8 +33,8 @@ namespace dbaui
         bool    m_bEmphasized;
 
     public:
-        OBoldListboxString(SvTreeListEntry* _pEntry, sal_uInt16 _nFlags, const OUString& _rStr)
-            :SvLBoxString(_pEntry, _nFlags, _rStr)
+        OBoldListboxString(const OUString& _rStr)
+            :SvLBoxString(_rStr)
             ,m_bEmphasized(false)
         {
         }
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 46824121513c..a8c5fea0f2f3 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -334,8 +334,8 @@ class OColumnString : public SvLBoxString
 {
     bool m_bReadOnly;
 public:
-    OColumnString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rStr, bool _RO)
-        :SvLBoxString(pEntry,nFlags,rStr)
+    OColumnString( const OUString& rStr, bool _RO )
+        :SvLBoxString(rStr)
         ,m_bReadOnly(_RO)
     {
     }
@@ -373,7 +373,7 @@ VCL_BUILDER_FACTORY(OColumnTreeBox)
 void OColumnTreeBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind)
 {
     DBTreeListBox::InitEntry(pEntry, rStr, rImg1, rImg2, eButtonKind);
-    pEntry->ReplaceItem(o3tl::make_unique<OColumnString>(pEntry, 0, rStr,false), pEntry->ItemCount() - 1);
+    pEntry->ReplaceItem(o3tl::make_unique<OColumnString>(rStr,false), pEntry->ItemCount() - 1);
 }
 
 bool OColumnTreeBox::Select( SvTreeListEntry* pEntry, bool bSelect )
diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx
index e292a775d4d1..26bdb2123d9b 100644
--- a/include/svtools/svlbitm.hxx
+++ b/include/svtools/svlbitm.hxx
@@ -106,7 +106,7 @@ protected:
     OUString maText;
 
 public:
-    SvLBoxString(SvTreeListEntry*, sal_uInt16 nFlags, const OUString& rText);
+    SvLBoxString(const OUString& rText);
     SvLBoxString();
     virtual ~SvLBoxString();
 
@@ -162,9 +162,7 @@ public:
     // (which cannot be modified via UI), or a static image
     // (see SV_BMP_STATICIMAGE; nFlags are effectively ignored
     // for that kind).
-    SvLBoxButton( SvTreeListEntry* pEntry,
-                  SvLBoxButtonKind eTheKind, sal_uInt16 nFlags,
-                  SvLBoxButtonData* pBData );
+    SvLBoxButton( SvLBoxButtonKind eTheKind, SvLBoxButtonData* pBData );
     SvLBoxButton();
     virtual ~SvLBoxButton();
     virtual void InitViewData(SvTreeListBox* pView,
@@ -245,9 +243,7 @@ class SVT_DLLPUBLIC SvLBoxContextBmp : public SvLBoxItem
 {
     SvLBoxContextBmp_Impl*  m_pImpl;
 public:
-    SvLBoxContextBmp(SvTreeListEntry* pEntry,
-                     sal_uInt16 nItemFlags,
-                     Image aBmp1,
+    SvLBoxContextBmp(Image aBmp1,
                      Image aBmp2,
                      bool bExpanded);
     SvLBoxContextBmp();
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 3ca4500444f0..c365f041e21a 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -159,7 +159,6 @@ public:
 class SVT_DLLPUBLIC SvLBoxItem
 {
 public:
-                        SvLBoxItem( SvTreeListEntry*, sal_uInt16 nFlags );
                         SvLBoxItem();
     virtual             ~SvLBoxItem();
     virtual sal_uInt16 GetType() const = 0;
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index caad6c390646..e0dcf18e891c 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -68,8 +68,7 @@ private:
     Color           aPrivColor;
 
 public:
-                    SvLBoxColorString( SvTreeListEntry*, sal_uInt16 nFlags, const OUString& rStr,
-                                    const Color& rCol);
+                    SvLBoxColorString( const OUString& rStr, const Color& rCol);
                     SvLBoxColorString();
                     virtual ~SvLBoxColorString();
 
diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx
index be1983330dab..eed5eb3f5ca0 100644
--- a/include/svx/fontlb.hxx
+++ b/include/svx/fontlb.hxx
@@ -36,8 +36,6 @@ private:
 public:
                                 SvLBoxFontString();
                                 SvLBoxFontString(
-                                    SvTreeListEntry* pEntry,
-                                    sal_uInt16 nFlags,
                                     const OUString& rString,
                                     const vcl::Font& rFont,
                                     const Color* pColor = nullptr );
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index 0b74046f7c81..18d0663aa965 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -28,6 +28,7 @@
 #include <unotools/collatorwrapper.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <svtools/treelistentry.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <algorithm>
 
@@ -59,8 +60,8 @@ class ScSolverOptionsString : public SvLBoxString
     sal_Int32   mnIntValue;
 
 public:
-    ScSolverOptionsString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& rStr ) :
-        SvLBoxString( pEntry, nFlags, rStr ),
+    ScSolverOptionsString( const OUString& rStr ) :
+        SvLBoxString( rStr ),
         mbIsDouble( false ),
         mfDoubleValue( 0.0 ),
         mnIntValue( 0 ) {}
@@ -264,27 +265,23 @@ void ScSolverOptionsDialog::FillListBox()
             // check box entry
             pEntry = new SvTreeListEntry;
             std::unique_ptr<SvLBoxButton> pButton(new SvLBoxButton(
-                pEntry, SvLBoxButtonKind_enabledCheckbox, 0, mpCheckButtonData));
+                SvLBoxButtonKind_enabledCheckbox, mpCheckButtonData));
             if ( ScUnoHelpFunctions::GetBoolFromAny( aValue ) )
                 pButton->SetStateChecked();
             else
                 pButton->SetStateUnchecked();
             pEntry->AddItem(std::move(pButton));
-            pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(
-                new SvLBoxContextBmp(pEntry, 0, Image(), Image(), false)));
-            pEntry->AddItem(std::unique_ptr<SvLBoxString>(
-                new SvLBoxString( pEntry, 0, aVisName)));
+            pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false));
+            pEntry->AddItem(o3tl::make_unique<SvLBoxString>(aVisName));
         }
         else
         {
             // value entry
             pEntry = new SvTreeListEntry;
-            pEntry->AddItem(std::unique_ptr<SvLBoxString>(
-                new SvLBoxString(pEntry, 0, ""))); // empty column
-            pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(
-                new SvLBoxContextBmp(pEntry, 0, Image(), Image(), false)));
+            pEntry->AddItem(o3tl::make_unique<SvLBoxString>("")); // empty column
+            pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false));
             std::unique_ptr<ScSolverOptionsString> pItem(
-                new ScSolverOptionsString(pEntry, 0, aVisName));
+                new ScSolverOptionsString(aVisName));
             if ( eClass == uno::TypeClass_DOUBLE )
             {
                 double fDoubleValue = 0.0;
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index b2940d1bc313..6a92d19f6d1b 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -1674,7 +1674,7 @@ void ScContentTree::InitEntry(SvTreeListEntry* pEntry,
     sal_uInt16 nColToHilite = 1; //0==Bitmap;1=="Spalte1";2=="Spalte2"
     SvTreeListBox::InitEntry( pEntry, rStr, rImg1, rImg2, eButtonKind );
     SvLBoxString& rCol = static_cast<SvLBoxString&>(pEntry->GetItem( nColToHilite ));
-    pEntry->ReplaceItem(o3tl::make_unique<SvLBoxString>(pEntry, 0, rCol.GetText()), nColToHilite);
+    pEntry->ReplaceItem(o3tl::make_unique<SvLBoxString>(rCol.GetText()), nColToHilite);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index dcbefcaf8b49..07138faa9c04 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -35,6 +35,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include "sdresid.hxx"
 
@@ -203,7 +204,7 @@ static OUString getDescription( const Any& rTarget, bool bWithText = true )
 class CustomAnimationListEntryItem : public SvLBoxString
 {
 public:
-    CustomAnimationListEntryItem(SvTreeListEntry*, sal_uInt16 nFlags, const OUString& aDescription,
+    CustomAnimationListEntryItem(const OUString& aDescription,
                                  CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent);
     virtual ~CustomAnimationListEntryItem();
     void InitViewData(SvTreeListBox*,SvTreeListEntry*,SvViewDataItem*) override;
@@ -222,8 +223,8 @@ private:
     const long nItemMinHeight = 38;
 };
 
-CustomAnimationListEntryItem::CustomAnimationListEntryItem( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent  )
-: SvLBoxString( pEntry, nFlags, aDescription )
+CustomAnimationListEntryItem::CustomAnimationListEntryItem( const OUString& aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent  )
+: SvLBoxString( aDescription )
 , mpParent( pParent )
 , msDescription( aDescription )
 , msEffectName( OUString() )
@@ -376,7 +377,7 @@ CustomAnimationListEntry::~CustomAnimationListEntry()
 class CustomAnimationTriggerEntryItem : public SvLBoxString
 {
 public:
-                    CustomAnimationTriggerEntryItem( SvTreeListEntry*,sal_uInt16 nFlags, const OUString& aDescription );
+                    CustomAnimationTriggerEntryItem( const OUString& aDescription );
     virtual         ~CustomAnimationTriggerEntryItem();
     void            InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) override;
     SvLBoxItem*     Create() const override;
@@ -389,8 +390,8 @@ private:
     const long nIconWidth = 19;
 };
 
-CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& aDescription )
-: SvLBoxString( pEntry, nFlags, aDescription ), msDescription( aDescription )
+CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( const OUString& aDescription )
+: SvLBoxString( aDescription ), msDescription( aDescription )
 {
 }
 
@@ -656,13 +657,11 @@ void CustomAnimationList::update()
             if( xShape.is() )
             {
                 SvTreeListEntry* pLBoxEntry = new CustomAnimationListEntry;
-                pLBoxEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(
-                    new SvLBoxContextBmp(pLBoxEntry, 0, Image(), Image(), false)));
+                pLBoxEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false));
                 OUString aDescription = SD_RESSTR(STR_CUSTOMANIMATION_TRIGGER);
                 aDescription += ": ";
                 aDescription += getShapeDescription( xShape, false );
-                pLBoxEntry->AddItem(std::unique_ptr<CustomAnimationTriggerEntryItem>(
-                    new CustomAnimationTriggerEntryItem(pLBoxEntry, 0, aDescription)));
+                pLBoxEntry->AddItem(o3tl::make_unique<CustomAnimationTriggerEntryItem>(aDescription));
                 Insert( pLBoxEntry );
                 SvViewDataEntry* pViewData = GetViewData( pLBoxEntry );
                 if( pViewData )
@@ -766,10 +765,8 @@ void CustomAnimationList::append( CustomAnimationEffectPtr pEffect )
         // create an entry for the effect
         SvTreeListEntry* pEntry = new CustomAnimationListEntry( pEffect );
 
-        pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(new SvLBoxContextBmp(
-                            pEntry, 0, Image(), Image(), false)));
-        pEntry->AddItem(std::unique_ptr<CustomAnimationListEntryItem>(
-            new CustomAnimationListEntryItem(pEntry, 0, aDescription, pEffect, this)));
+        pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false));
+        pEntry->AddItem(o3tl::make_unique<CustomAnimationListEntryItem>(aDescription, pEffect, this));
 
         if( pParentEntry )
         {
diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx
index 20a3dea9ccf4..fe439cd83f8c 100644
--- a/sd/source/ui/dlg/dlgassim.cxx
+++ b/sd/source/ui/dlg/dlgassim.cxx
@@ -26,6 +26,7 @@
 
 #include <vcl/svapp.hxx>
 #include <vcl/builderfactory.hxx>
+#include <o3tl/make_unique.hxx>
 #include "svtools/svlbitm.hxx"
 #include "svtools/treelistentry.hxx"
 
@@ -94,12 +95,9 @@ SvTreeListEntry* SdPageListControl::InsertPage( const OUString& rPageName )
 {
     SvTreeListEntry* pEntry = new SvTreeListEntry;
 
-    pEntry->AddItem(std::unique_ptr<SvLBoxButton>(new SvLBoxButton(
-                pEntry, SvLBoxButtonKind_enabledCheckbox, 0, m_pCheckButton)));
-    pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(new SvLBoxContextBmp(
-                pEntry, 0, Image(), Image(), false)));    // otherwise boom!
-    pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(
-                pEntry, 0, rPageName)));
+    pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind_enabledCheckbox, m_pCheckButton));
+    pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false));    // otherwise boom!
+    pEntry->AddItem(o3tl::make_unique<SvLBoxString>(rPageName));
 
     GetModel()->Insert( pEntry );
 
@@ -109,12 +107,9 @@ SvTreeListEntry* SdPageListControl::InsertPage( const OUString& rPageName )
 void SdPageListControl::InsertTitle( SvTreeListEntry* pParent, const OUString& rTitle )
 {
     SvTreeListEntry* pEntry = new SvTreeListEntry;
-    pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(
-                    pEntry, 0, OUString())));
-    pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(new SvLBoxContextBmp(
-                    pEntry, 0, Image(), Image(), false)));    // otherwise boom!
-    pEntry->AddItem(std::unique_ptr<SvLBoxString>(new SvLBoxString(
-                    pEntry, 0, rTitle)));
+    pEntry->AddItem(o3tl::make_unique<SvLBoxString>(OUString()));
+    pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false));    // otherwise boom!
+    pEntry->AddItem(o3tl::make_unique<SvLBoxString>(rTitle));
     GetModel()->Insert( pEntry,pParent );
 }
 
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 726f13271794..0e0babdc0ab2 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -372,7 +372,7 @@ void SdPageObjsTLB::InitEntry(SvTreeListEntry* pEntry,
     sal_uInt16 nColToHilite = 1; //0==Bitmap;1=="Spalte1";2=="Spalte2"
     SvTreeListBox::InitEntry( pEntry, rStr, rImg1, rImg2, eButtonKind );
     SvLBoxString& rCol = static_cast<SvLBoxString&>(pEntry->GetItem( nColToHilite ));
-    pEntry->ReplaceItem(o3tl::make_unique<SvLBoxString>(pEntry, 0, rCol.GetText()), nColToHilite );
+    pEntry->ReplaceItem(o3tl::make_unique<SvLBoxString>(rCol.GetText()), nColToHilite );
 }
 
 void SdPageObjsTLB::SaveExpandedTreeItemState(SvTreeListEntry* pEntry, std::vector<OUString>& vectTreeItem)
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index b343050e65ea..e0f10e91a612 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -83,9 +83,7 @@ class StyleLBoxString : public SvLBoxString
     SvViewDataItem* mpViewData;
 
 public:
-    StyleLBoxString(SvTreeListEntry* pEntry,
-                    sal_uInt16 nFlags,
-                    const OUString& sText,
+    StyleLBoxString(const OUString& sText,
                     const SfxStyleFamily& eStyleFamily);
 
     virtual ~StyleLBoxString();
@@ -102,8 +100,8 @@ public:
 };
 
 
-StyleLBoxString::StyleLBoxString(SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& sText, const SfxStyleFamily& eStyleFamily)
-    : SvLBoxString(pEntry, nFlags, sText)
+StyleLBoxString::StyleLBoxString(const OUString& sText, const SfxStyleFamily& eStyleFamily)
+    : SvLBoxString(sText)
     , meStyleFamily(eStyleFamily)
     , mpViewData(nullptr)
 {}
@@ -632,7 +630,7 @@ SvTreeListEntry* FillBox_Impl(SvTreeListBox* pBox,
 
     if (officecfg::Office::Common::StylesAndFormatting::Preview::get())
     {
-        pTreeListEntry->ReplaceItem(o3tl::make_unique<StyleLBoxString>(pTreeListEntry, 0, pEntry->getName(), eStyleFamily), 1);
+        pTreeListEntry->ReplaceItem(o3tl::make_unique<StyleLBoxString>(pEntry->getName(), eStyleFamily), 1);
     }
 
     pBox->GetModel()->InvalidateEntry(pTreeListEntry);
@@ -1248,7 +1246,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
                     SvTreeListEntry* pTreeListEntry = aFmtLb->InsertEntry(aStrings[nPos], nullptr, false, nPos);
                     if (officecfg::Office::Common::StylesAndFormatting::Preview::get())
                     {
-                        pTreeListEntry->ReplaceItem(o3tl::make_unique<StyleLBoxString>(pTreeListEntry, 0, aStrings[nPos], eFam), 1);
+                        pTreeListEntry->ReplaceItem(o3tl::make_unique<StyleLBoxString>(aStrings[nPos], eFam), 1);
                     }
                     aFmtLb->GetModel()->InvalidateEntry(pTreeListEntry);
                 }
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())
 {
 }
 
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 */
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index 2634ea401c0f..034dcf4e1d72 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -233,8 +233,7 @@ class SwLBoxString : public SvLBoxString
 {
 public:
 
-    SwLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags,
-        const OUString& rStr ) : SvLBoxString(pEntry,nFlags,rStr)
+    SwLBoxString( const OUString& rStr ) : SvLBoxString(rStr)
     {
     }
 
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 8fe42eb93f9a..6280e001a199 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3408,8 +3408,7 @@ bool NaviContentBookmark::Paste( TransferableDataHelper& rData )
 class SwContentLBoxString : public SvLBoxString
 {
 public:
-    SwContentLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags,
-        const OUString& rStr ) : SvLBoxString(pEntry,nFlags,rStr) {}
+    SwContentLBoxString( const OUString& rStr ) : SvLBoxString(rStr) {}
 
     virtual void Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext,
                        const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override;
@@ -3422,7 +3421,7 @@ void SwContentTree::InitEntry(SvTreeListEntry* pEntry,
     const size_t nColToHilite = 1; //0==Bitmap;1=="Column1";2=="Column2"
     SvTreeListBox::InitEntry( pEntry, rStr, rImg1, rImg2, eButtonKind );
     SvLBoxString& rCol = static_cast<SvLBoxString&>(pEntry->GetItem( nColToHilite ));
-    pEntry->ReplaceItem(o3tl::make_unique<SwContentLBoxString>(pEntry, 0, rCol.GetText()), nColToHilite);
+    pEntry->ReplaceItem(o3tl::make_unique<SwContentLBoxString>(rCol.GetText()), nColToHilite);
 }
 
 void SwContentLBoxString::Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext,
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 6459620a76b8..b8136da4c126 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -1233,7 +1233,7 @@ void SwGlobalTree::InitEntry(SvTreeListEntry* pEntry,
     const size_t nColToHilite = 1; //0==Bitmap;1=="Column1";2=="Column2"
     SvTreeListBox::InitEntry( pEntry, rStr, rImg1, rImg2, eButtonKind );
     SvLBoxString& rCol = static_cast<SvLBoxString&>(pEntry->GetItem( nColToHilite ));
-    pEntry->ReplaceItem(o3tl::make_unique<SwLBoxString>(pEntry, 0, rCol.GetText()), nColToHilite);
+    pEntry->ReplaceItem(o3tl::make_unique<SwLBoxString>(rCol.GetText()), nColToHilite);
 }
 
 void SwLBoxString::Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext,