diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-04 11:40:31 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-04 14:51:07 +0200 |
commit | eeb1030c6455d4b45bdd4e535a3eafd809716e54 (patch) | |
tree | a4ef1f47835c5e6fb0ba4f46948e433c7c9f59c4 /cui | |
parent | 3054a8c1c148aee9cb3feaa4e7b5edee010deead (diff) |
loplugin:unusedfields in cui..idl
Change-Id: Icb393cc0b2f79ded154e186ab6975b95e5126903
Reviewed-on: https://gerrit.libreoffice.org/39496
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/cuicharmap.cxx | 7 | ||||
-rw-r--r-- | cui/source/dialogs/scriptdlg.cxx | 10 | ||||
-rw-r--r-- | cui/source/factory/dlgfact.cxx | 2 | ||||
-rw-r--r-- | cui/source/inc/cuicharmap.hxx | 3 | ||||
-rw-r--r-- | cui/source/inc/scriptdlg.hxx | 12 | ||||
-rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/numpages.cxx | 2 |
7 files changed, 15 insertions, 23 deletions
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 58438b0fa913..ad088cfa30e1 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -51,9 +51,8 @@ using namespace css; // class SvxCharacterMap ================================================= -SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, bool bOne_, const SfxItemSet* pSet ) +SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, const SfxItemSet* pSet ) : SfxModalDialog(pParent, "SpecialCharactersDialog", "cui/ui/specialcharacters.ui") - , bOne( bOne_ ) , pSubsetMap( nullptr ) , mxContext(comphelper::getProcessComponentContext()) { @@ -91,10 +90,6 @@ SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, bool bOne_, const SfxIte get( m_pRecentCharView[14], "viewchar15" ); get( m_pRecentCharView[15], "viewchar16" ); - const SfxBoolItem* pItem = SfxItemSet::GetItem<SfxBoolItem>(pSet, FN_PARAM_1, false); - if ( pItem ) - bOne = pItem->GetValue(); - init(); const SfxInt32Item* pCharItem = SfxItemSet::GetItem<SfxInt32Item>(pSet, SID_ATTR_CHAR, false); diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index be35fb37e545..1e3860d71456 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -238,7 +238,7 @@ void SFTreeListBox::Init( const OUString& language ) getLangNodeFromRootNode( children[ n ], lang ); insertEntry( uiName, app ? OUStringLiteral(RID_CUIBMP_HARDDISK) : OUStringLiteral(RID_CUIBMP_DOC), - nullptr, true, o3tl::make_unique< SFEntry >( OBJTYPE_SFROOT, langEntries, xDocumentModel ), factoryURL ); + nullptr, true, o3tl::make_unique< SFEntry >( langEntries, xDocumentModel ), factoryURL ); } SetUpdateMode( true ); @@ -319,11 +319,11 @@ void SFTreeListBox:: RequestSubEntries( SvTreeListEntry* pRootEntry, Reference< OUString name( children[ n ]->getName() ); if ( children[ n ]->getType() != browse::BrowseNodeTypes::SCRIPT) { - insertEntry(name, RID_CUIBMP_LIB, pRootEntry, true, o3tl::make_unique< SFEntry >( OBJTYPE_SCRIPTCONTAINER, children[ n ],model)); + insertEntry(name, RID_CUIBMP_LIB, pRootEntry, true, o3tl::make_unique< SFEntry >( children[ n ],model)); } else { - insertEntry(name, RID_CUIBMP_MACRO, pRootEntry, false, o3tl::make_unique< SFEntry >( OBJTYPE_METHOD, children[ n ],model)); + insertEntry(name, RID_CUIBMP_MACRO, pRootEntry, false, o3tl::make_unique< SFEntry >( children[ n ],model)); } } } @@ -951,12 +951,12 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) if ( aChildNode->getType() == browse::BrowseNodeTypes::SCRIPT ) { pNewEntry = m_pScriptsBox->insertEntry( aChildName, - RID_CUIBMP_MACRO, pEntry, false, o3tl::make_unique< SFEntry >( OBJTYPE_METHOD, aChildNode,xDocumentModel ) ); + RID_CUIBMP_MACRO, pEntry, false, o3tl::make_unique< SFEntry >( aChildNode,xDocumentModel ) ); } else { pNewEntry = m_pScriptsBox->insertEntry( aChildName, - RID_CUIBMP_LIB, pEntry, false, o3tl::make_unique< SFEntry >( OBJTYPE_SCRIPTCONTAINER, aChildNode,xDocumentModel ) ); + RID_CUIBMP_LIB, pEntry, false, o3tl::make_unique< SFEntry >( aChildNode,xDocumentModel ) ); // If the Parent is not loaded then set to // loaded, this will prevent RequestingChildren ( called diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index cf945c40f955..3c1287180cae 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1232,7 +1232,7 @@ VclPtr<SfxAbstractDialog> AbstractDialogFactory_Impl::CreateSfxDialog( vcl::Wind pDlg = VclPtr<SfxMacroAssignDlg>::Create( pParent, _rxDocumentFrame, rAttr ); break; case RID_SVXDLG_CHARMAP : - pDlg = VclPtr<SvxCharacterMap>::Create( pParent, true, &rAttr ); + pDlg = VclPtr<SvxCharacterMap>::Create( pParent, &rAttr ); break; default: break; diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index 4f1a63f5ec71..f3618bc9d51e 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -80,7 +80,6 @@ private: VclPtr<Edit> m_pDecimalCodeText; VclPtr<SvxCharView> m_pRecentCharView[16]; vcl::Font aFont; - bool bOne; const SubsetMap* pSubsetMap; std::deque<OUString> maRecentCharList; @@ -106,7 +105,7 @@ private: void selectCharByCode(Radix radix); public: - SvxCharacterMap( vcl::Window* pParent, bool bOne=true, const SfxItemSet* pSet=nullptr ); + SvxCharacterMap( vcl::Window* pParent, const SfxItemSet* pSet=nullptr ); virtual ~SvxCharacterMap() override; virtual short Execute() override; virtual void dispose() override; diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 15189d447568..0fdc0fd1e202 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -112,15 +112,13 @@ public: class SFEntry final { private: - sal_uInt8 nType; bool loaded; - css::uno::Reference< css::script::browse::XBrowseNode > nodes; - css::uno::Reference< css::frame::XModel > model; + css::uno::Reference< css::script::browse::XBrowseNode > nodes; + css::uno::Reference< css::frame::XModel > model; public: - SFEntry( sal_uInt8 nT, - const css::uno::Reference< css::script::browse::XBrowseNode >& entryNodes , - const css::uno::Reference< css::frame::XModel >& entryModel) { nType = nT; nodes = entryNodes; loaded=false; model = entryModel; } - SFEntry( const SFEntry& r ) { nType = r.nType; nodes = r.nodes; loaded = r.loaded; } + SFEntry( const css::uno::Reference< css::script::browse::XBrowseNode >& entryNodes , + const css::uno::Reference< css::frame::XModel >& entryModel) { nodes = entryNodes; loaded=false; model = entryModel; } + SFEntry( const SFEntry& r ) { nodes = r.nodes; loaded = r.loaded; } const css::uno::Reference< css::script::browse::XBrowseNode >& GetNode() { return nodes ;} const css::uno::Reference< css::frame::XModel >& GetModel() { return model ;}; bool isLoaded() const { return loaded; } diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index e4037f7c0ae1..0c7713894636 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -2057,7 +2057,7 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, Button*, pBtn, void ) else if (pBtn == m_pDblEndQuotePB) nMode = DBL_END; // start character selection dialog - ScopedVclPtrInstance< SvxCharacterMap > pMap( this, true ); + ScopedVclPtrInstance< SvxCharacterMap > pMap( this ); pMap->SetCharFont( OutputDevice::GetDefaultFont(DefaultFontType::LATIN_TEXT, LANGUAGE_ENGLISH_US, GetDefaultFontFlags::OnlyOne )); pMap->SetText(nMode < SGL_END ? CuiResId(RID_SVXSTR_STARTQUOTE) : CuiResId(RID_SVXSTR_ENDQUOTE) ); diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 8d4da92cedf5..f8c3f4de8738 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -2075,7 +2075,7 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl, MenuButton *, void) IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl, Button*, void) { - VclPtrInstance< SvxCharacterMap > pMap( this, true ); + VclPtrInstance< SvxCharacterMap > pMap( this ); sal_uInt16 nMask = 1; const vcl::Font* pFmtFont = nullptr; |