diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-24 09:07:42 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-25 08:05:58 +0100 |
commit | d434bd5493443cd9af2e35fa540f931c1b3aa2bf (patch) | |
tree | 68cacdca9baeb363037b55f2da3f62a15482635e | |
parent | b61cfadb71597dd132d6a783484e6763c9361bde (diff) |
loplugin:unusedfields in cui
Change-Id: Idf3cea56649c0f6eeb6c901ac33b128eb2dd97fb
Reviewed-on: https://gerrit.libreoffice.org/68278
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | cui/source/customize/SvxToolbarConfigPage.cxx | 3 | ||||
-rw-r--r-- | cui/source/customize/acccfg.cxx | 8 | ||||
-rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/hlmarkwn.cxx | 2 | ||||
-rw-r--r-- | cui/source/inc/SvxToolbarConfigPage.hxx | 1 | ||||
-rw-r--r-- | cui/source/inc/acccfg.hxx | 10 | ||||
-rw-r--r-- | cui/source/inc/cuitabline.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/hlmarkwn.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/tabstpge.hxx | 6 | ||||
-rw-r--r-- | cui/source/inc/transfrm.hxx | 3 | ||||
-rw-r--r-- | cui/source/options/treeopt.cxx | 15 | ||||
-rw-r--r-- | cui/source/tabpages/tabline.cxx | 1 | ||||
-rw-r--r-- | cui/source/tabpages/tabstpge.cxx | 9 | ||||
-rw-r--r-- | cui/source/tabpages/tpline.cxx | 8 | ||||
-rw-r--r-- | cui/source/tabpages/transfrm.cxx | 9 |
15 files changed, 4 insertions, 79 deletions
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx index 174cf7f458ae..6775c37e4a86 100644 --- a/cui/source/customize/SvxToolbarConfigPage.cxx +++ b/cui/source/customize/SvxToolbarConfigPage.cxx @@ -939,9 +939,6 @@ void SvxToolbarEntriesListBox::BuildCheckBoxButtonImages( SvLBoxButtonData* pDat pData->SetImage(SvBmp::HIUNCHECKED, GetSizedImage( *pVDev, aSize, CheckBox::GetCheckImage( rSettings, DrawButtonFlags::Default | DrawButtonFlags::Pressed)) ); pData->SetImage(SvBmp::TRISTATE, GetSizedImage( *pVDev, aSize, Image() ) ); // Use tristate bitmaps to have no checkbox for separator entries pData->SetImage(SvBmp::HITRISTATE, GetSizedImage( *pVDev, aSize, Image() ) ); - - // Get image size - m_aCheckBoxImageSizePixel = aImage.GetSizePixel(); } Image SvxToolbarEntriesListBox::GetSizedImage( diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 7f8abc0d83a0..a5a63eeba4bc 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -832,12 +832,6 @@ SfxAccCfgTabListBox_Impl::~SfxAccCfgTabListBox_Impl() disposeOnce(); } -void SfxAccCfgTabListBox_Impl::dispose() -{ - m_pAccelConfigPage.clear(); - SvTabListBox::dispose(); -} - /** select the entry, which match the current key input ... excepting keys, which are used for the dialog itself. */ @@ -904,7 +898,6 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( vcl::Window* pParent, const Size aSize(LogicToPixel(Size(174, 100), MapMode(MapUnit::MapAppFont))); m_pEntriesBox->set_width_request(aSize.Width()); m_pEntriesBox->set_height_request(aSize.Height()); - m_pEntriesBox->SetAccelConfigPage(this); get(m_pGroupLBox, "category"); aSize = LogicToPixel(Size(78 , 91), MapMode(MapUnit::MapAppFont)); m_pGroupLBox->set_width_request(aSize.Width()); @@ -1041,7 +1034,6 @@ void SfxAcceleratorConfigPage::InitAccCfg() frame::ModuleManager::create(m_xContext); m_sModuleLongName = xModuleManager->identify(m_xFrame); comphelper::SequenceAsHashMap lModuleProps(xModuleManager->getByName(m_sModuleLongName)); - m_sModuleShortName = lModuleProps.getUnpackedValueOrDefault("ooSetupFactoryShortName", OUString()); m_sModuleUIName = lModuleProps.getUnpackedValueOrDefault("ooSetupFactoryUIName", OUString()); // get global accelerator configuration diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 06bba88c874a..ffb214140e35 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -1205,7 +1205,6 @@ public: virtual sal_Int16 SAL_CALL execute( ) override; private: - OUString msTitle; Color mnColor; sal_Int16 mnMode; Reference<css::awt::XWindow> mxParent; @@ -1287,9 +1286,8 @@ void SAL_CALL ColorPicker::setPropertyValues( const Sequence< PropertyValue >& a } // XExecutableDialog -void SAL_CALL ColorPicker::setTitle( const OUString& sTitle ) +void SAL_CALL ColorPicker::setTitle( const OUString& ) { - msTitle = sTitle; } sal_Int16 SAL_CALL ColorPicker::execute() diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index cbd9ba908673..408c8f36f9b7 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -287,8 +287,6 @@ void SvxHlinkDlgMarkWnd::RefreshTree (const OUString& aStrURL) RestoreLastSelection(); LeaveWait(); - - maStrLastURL = aStrURL; } // get links from document diff --git a/cui/source/inc/SvxToolbarConfigPage.hxx b/cui/source/inc/SvxToolbarConfigPage.hxx index 03fc04034995..e3de02d96ce6 100644 --- a/cui/source/inc/SvxToolbarConfigPage.hxx +++ b/cui/source/inc/SvxToolbarConfigPage.hxx @@ -90,7 +90,6 @@ public: class SvxToolbarEntriesListBox final : public SvxMenuEntriesListBox { - Size m_aCheckBoxImageSizePixel; std::unique_ptr<SvLBoxButtonData> m_pButtonData; VclPtr<SvxConfigPage> pPage; diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 4c626059e6e2..436fbbe2d4d2 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -48,23 +48,14 @@ class SfxStringItem; class SfxAccCfgTabListBox_Impl : public SvTabListBox { - VclPtr<SfxAcceleratorConfigPage> m_pAccelConfigPage; - void KeyInput( const KeyEvent &rKEvt ) override; public: SfxAccCfgTabListBox_Impl(vcl::Window *pParent, WinBits nStyle) : SvTabListBox(pParent, nStyle) - , m_pAccelConfigPage(nullptr) { } virtual ~SfxAccCfgTabListBox_Impl() override; - virtual void dispose() override; - - void SetAccelConfigPage(SfxAcceleratorConfigPage* pAccelConfigPage) - { - m_pAccelConfigPage = pAccelConfigPage; - } }; // class SfxAcceleratorConfigPage ---------------------------------------- @@ -136,7 +127,6 @@ private: css::uno::Reference< css::frame::XFrame > m_xFrame; OUString m_sModuleLongName; - OUString m_sModuleShortName; OUString m_sModuleUIName; // For search diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 6349108da546..8cfdcc84d571 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -113,7 +113,6 @@ private: XLineAttrSetItem m_aXLineAttr; SfxItemSet& m_rXLSet; - XColorListRef m_pColorList; XDashListRef m_pDashList; XLineEndListRef m_pLineEndList; @@ -214,7 +213,6 @@ public: virtual void FillUserData() override; - void SetColorList( XColorListRef const & pColorList ) { m_pColorList = pColorList; } void SetDashList( XDashListRef const & pDshLst ) { m_pDashList = pDshLst; } void SetLineEndList( XLineEndListRef const & pLneEndLst) { m_pLineEndList = pLneEndLst; } void SetObjSelected( bool bHasObj ) { m_bObjSelected = bHasObj; } diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index 160889c4f125..f1c79e719586 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -72,8 +72,6 @@ private: VclPtr<SvxHyperlinkTabPageBase> mpParent; - OUString maStrLastURL; - sal_uInt16 mnError; protected: diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 7ad63e4cbf38..3288e0536ffb 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -33,19 +33,15 @@ class SvxTabulatorTabPage; class TabWin_Impl : public weld::CustomWidgetController { private: - VclPtr<SvxTabulatorTabPage> mpPage; sal_uInt16 nTabStyle; public: - TabWin_Impl() - : mpPage(nullptr) - , nTabStyle(0) + TabWin_Impl() : nTabStyle(0) { } virtual void Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect) override; - void SetTabulatorTabPage(SvxTabulatorTabPage* pPage); void SetTabStyle(sal_uInt16 nStyle) {nTabStyle = nStyle; } }; diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 89569e2e35ea..0d7b6fe5a75b 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -224,9 +224,6 @@ private: const SdrView* pView; - // #i75273# - basegfx::B2DRange maRange; - MapUnit ePoolUnit; FieldUnit eDlgUnit; diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 0c01d7fc677c..27f8aa4dcb5e 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -468,12 +468,10 @@ struct OptionsGroupInfo SfxShell* m_pShell; // used to create the page SfxModule* m_pModule; // used to create the ItemSet sal_uInt16 m_nDialogId; // Id of the former dialog - OUString m_sPageURL; OptionsGroupInfo( SfxShell* pSh, SfxModule* pMod, sal_uInt16 nId ) : m_pShell( pSh ), - m_pModule( pMod ), m_nDialogId( nId ), - m_sPageURL( OUString() ) {} + m_pModule( pMod ), m_nDialogId( nId ) {} }; #define INI_LIST() \ @@ -1985,17 +1983,6 @@ static void lcl_insertLeaf( { sal_uInt16 nNodeGrpId = getGroupNodeId( pNode->m_sId ); nGrpId = pDlg->AddGroup( pNode->m_sLabel, nullptr, nullptr, nNodeGrpId ); - if ( !pNode->m_sPageURL.isEmpty() ) - { - SvTreeListEntry* pGrpEntry = rTreeLB.GetEntry( nullptr, nGrpId ); - DBG_ASSERT( pGrpEntry, "OfaTreeOptionsDialog::InsertNodes(): no group" ); - if ( pGrpEntry ) - { - OptionsGroupInfo* pGrpInfo = - static_cast<OptionsGroupInfo*>(pGrpEntry->GetUserData()); - pGrpInfo->m_sPageURL = pNode->m_sPageURL; - } - } } OptionsPageInfo* pInfo = pDlg->AddTabPage( 0, pLeaf->m_sLabel, nGrpId ); pInfo->m_sPageURL = pLeaf->m_sPageURL; diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index df1b6a3ba9d9..24d0af9d36de 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -166,7 +166,6 @@ void SvxLineTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage) { if (rId == "RID_SVXPAGE_LINE") { - static_cast<SvxLineTabPage&>(rPage).SetColorList( pColorList ); static_cast<SvxLineTabPage&>(rPage).SetDashList( pDashList ); static_cast<SvxLineTabPage&>(rPage).SetLineEndList( pLineEndList ); static_cast<SvxLineTabPage&>(rPage).SetDlgType( 0 ); diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index ae4f559a43b1..1d7f009419fc 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -51,11 +51,6 @@ static void FillUpWithDefTabs_Impl( long nDefDist, SvxTabStopItem& rTabs ) } } -void TabWin_Impl::SetTabulatorTabPage(SvxTabulatorTabPage* pPage) -{ - mpPage = pPage; -} - void TabWin_Impl::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle&) { // Paint tabulators @@ -96,10 +91,6 @@ SvxTabulatorTabPage::SvxTabulatorTabPage(TabPageParent pParent, const SfxItemSet , m_xCenterWin(new weld::CustomWeld(*m_xBuilder, "drawingareaWIN_TABCENTER", m_aCenterWin)) , m_xDezWin(new weld::CustomWeld(*m_xBuilder, "drawingareaWIN_TABDECIMAL", m_aDezWin)) { - m_aLeftWin.SetTabulatorTabPage(this); - m_aRightWin.SetTabulatorTabPage(this); - m_aCenterWin.SetTabulatorTabPage(this); - m_aDezWin.SetTabulatorTabPage(this); m_aLeftWin.SetTabStyle(sal_uInt16(RULER_TAB_LEFT|WB_HORZ)); m_aRightWin.SetTabStyle(sal_uInt16(RULER_TAB_RIGHT|WB_HORZ)); m_aCenterWin.SetTabStyle(sal_uInt16(RULER_TAB_CENTER|WB_HORZ)); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index db35461472b6..57d58f95adf8 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -338,10 +338,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) // ColorList if( *m_pnColorListState != ChangeType::NONE ) { - if( *m_pnColorListState & ChangeType::CHANGED ) - m_pColorList = static_cast<SvxLineTabDialog*>(GetDialogController())->GetNewColorList(); - - ChangePreviewHdl_Impl( nullptr ); + ChangePreviewHdl_Impl( nullptr ); } m_nPageType = PageType::Area; @@ -1664,7 +1661,6 @@ void SvxLineTabPage::DataChanged( const DataChangedEvent& rDCEvt ) void SvxLineTabPage::PageCreated(const SfxAllItemSet& aSet) { - const SvxColorListItem* pColorListItem = aSet.GetItem<SvxColorListItem>(SID_COLOR_TABLE, false); const SvxDashListItem* pDashListItem = aSet.GetItem<SvxDashListItem>(SID_DASH_LIST, false); const SvxLineEndListItem* pLineEndListItem = aSet.GetItem<SvxLineEndListItem>(SID_LINEEND_LIST, false); const SfxUInt16Item* pPageTypeItem = aSet.GetItem<SfxUInt16Item>(SID_PAGE_TYPE, false); @@ -1673,8 +1669,6 @@ void SvxLineTabPage::PageCreated(const SfxAllItemSet& aSet) const SfxTabDialogItem* pSymbolAttrItem = aSet.GetItem<SfxTabDialogItem>(SID_ATTR_SET, false); const SvxGraphicItem* pGraphicItem = aSet.GetItem<SvxGraphicItem>(SID_GRAPHIC, false); - if (pColorListItem) - SetColorList(pColorListItem->GetColorList()); if (pDashListItem) SetDashList(pDashListItem->GetDashList()); if (pLineEndListItem) diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 210869477114..9e3360953a9c 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -477,7 +477,6 @@ void SvxSlantTabPage::Construct() { // #i75273# ::tools::Rectangle aTempRect(pView->GetAllMarkedRect()); pView->GetSdrPageView()->LogicToPagePos(aTempRect); - maRange = basegfx::B2DRange(aTempRect.Left(), aTempRect.Top(), aTempRect.Right(), aTempRect.Bottom()); } } @@ -743,14 +742,6 @@ VclPtr<SfxTabPage> SvxSlantTabPage::Create(TabPageParent pParent, const SfxItemS void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet ) { - SfxRectangleItem const * pRectItem = nullptr; - - if( SfxItemState::SET == rSet.GetItemState( GetWhich( SID_ATTR_TRANSFORM_INTERN ) , false, reinterpret_cast<SfxPoolItem const **>(&pRectItem) ) ) - { - const ::tools::Rectangle aTempRect(pRectItem->GetValue()); - maRange = basegfx::B2DRange(aTempRect.Left(), aTempRect.Top(), aTempRect.Right(), aTempRect.Bottom()); - } - SfxBoolItem const * bPosProtect = nullptr; if(SfxItemState::SET == rSet.GetItemState( GetWhich(SID_ATTR_TRANSFORM_PROTECT_POS ) , false, reinterpret_cast<SfxPoolItem const **>(&bPosProtect) )) { |