diff options
author | Noel Grandin <noel@peralex.com> | 2016-03-18 11:02:37 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-03-18 11:03:00 +0200 |
commit | 0008c67004d3eb8e1fc7a5e13cd50269ba80e7d2 (patch) | |
tree | f366492e90770d9a2c5bfcc8e2f38eae01095e72 /cui/source/tabpages | |
parent | f1ff9375184607b86ae8807d7cf1220962425b51 (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 'cui/source/tabpages')
-rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 31 | ||||
-rw-r--r-- | cui/source/tabpages/macroass.cxx | 6 |
2 files changed, 17 insertions, 20 deletions
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 ); } } |