diff options
| author | Noel Grandin <noel@peralex.com> | 2016-03-07 08:09:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-03-07 09:16:00 +0000 |
| commit | 359e0b47a0f96ffa595a0c38a5e5318d797812fe (patch) | |
| tree | 3695eb961668945dda469fc659337cbdd8c89520 /cui | |
| parent | cc84aaf70ac56092b32d1d329143eca0550dce12 (diff) | |
loplugin:unuseddefaultparams
Change-Id: Ia414f7845425ef73859ed04853378e96cc738795
Reviewed-on: https://gerrit.libreoffice.org/22971
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/iconcdlg.cxx | 7 | ||||
| -rw-r--r-- | cui/source/dialogs/pastedlg.cxx | 6 | ||||
| -rw-r--r-- | cui/source/inc/iconcdlg.hxx | 2 | ||||
| -rw-r--r-- | cui/source/inc/pastedlg.hxx | 3 |
4 files changed, 7 insertions, 11 deletions
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index f098ac52e0b2..bcb644eacb3c 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -277,16 +277,15 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( sal_uInt16 nId, const OUString& rIconText, const Image& rChoiceIcon, - CreatePage pCreateFunc /* != 0 */, - GetPageRanges pRangesFunc /* darf 0 sein */ + CreatePage pCreateFunc /* != 0 */ ) { IconChoicePageData* pData = new IconChoicePageData ( nId, pCreateFunc, - pRangesFunc, + nullptr, false/*bItemsOnDemand*/ ); maPageList.push_back( pData ); - pData->fnGetRanges = pRangesFunc; + pData->fnGetRanges = nullptr; pData->bOnDemand = false; sal_uInt16 *pId = new sal_uInt16 ( nId ); diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index ecb11fe00813..9b91856de302 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -92,8 +92,7 @@ void SvPasteObjectDialog::Insert( SotClipboardFormatId nFormat, const OUString& aSupplementMap.insert( ::std::make_pair( nFormat, rFormatName ) ); } -SotClipboardFormatId SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, - const DataFlavorExVector* pFormats ) +SotClipboardFormatId SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper) { //TODO/LATER: why is the Descriptor never used?! TransferableObjectDescriptor aDesc; @@ -102,8 +101,7 @@ SotClipboardFormatId SvPasteObjectDialog::GetFormat( const TransferableDataHelpe (void)const_cast<TransferableDataHelper&>(rHelper).GetTransferableObjectDescriptor( SotClipboardFormatId::OBJECTDESCRIPTOR, aDesc); } - if ( !pFormats ) - pFormats = &rHelper.GetDataFlavorExVector(); + const DataFlavorExVector* pFormats = &rHelper.GetDataFlavorExVector(); // create and fill dialog box OUString aSourceName, aTypeName; diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 5d9a8b9b8d5a..851fb45d8e6c 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -177,7 +177,7 @@ public: // interface SvxIconChoiceCtrlEntry* AddTabPage( sal_uInt16 nId, const OUString& rIconText, const Image& rChoiceIcon, - CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = nullptr /* NULL allowed*/ ); + CreatePage pCreateFunc /* != NULL */ ); void SetCurPageId( sal_uInt16 nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); } sal_uInt16 GetCurPageId() const { return mnCurrentPageId; } diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index 0814445cfb00..7dd259c06dd0 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -60,8 +60,7 @@ public: void Insert( SotClipboardFormatId nFormat, const OUString & rFormatName ); void SetObjName( const SvGlobalName & rClass, const OUString & rObjName ); - SotClipboardFormatId GetFormat( const TransferableDataHelper& aHelper, - const DataFlavorExVector* pFormats=nullptr ); + SotClipboardFormatId GetFormat( const TransferableDataHelper& aHelper); }; #endif // INCLUDED_CUI_SOURCE_INC_PASTEDLG_HXX |