diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-24 09:41:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-24 13:47:52 +0200 |
| commit | 604bc943655b88994faa7f307d1c48e914965e95 (patch) | |
| tree | 51d09183f93c02371f764a5d1e68c7c54abcb0b5 /cui | |
| parent | a43187d9075c6347412a2584d764145127779df8 (diff) | |
loplugin:unusedfields readonly fields
Change-Id: I6629926df06f71ff86e9fb23ae4fc1ae73bc9406
Reviewed-on: https://gerrit.libreoffice.org/40360
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/hltpbase.cxx | 2 | ||||
| -rw-r--r-- | cui/source/inc/backgrnd.hxx | 1 | ||||
| -rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 7 |
3 files changed, 4 insertions, 6 deletions
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 520d0e017d2c..68afa3cb9433 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -159,7 +159,7 @@ void SvxHyperlinkTabPageBase::InitStdControls () if ( pFrame ) { std::unique_ptr<TargetList> pList(new TargetList); - pFrame->GetTargetList(*pList); + SfxFrame::GetDefaultTargetList(*pList); if( !pList->empty() ) { size_t nCount = pList->size(); diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index c200d996609c..de75d6923580 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -105,7 +105,6 @@ private: sal_uInt16 nHtmlMode; bool bAllowShowSelector : 1; bool bIsGraphicValid : 1; - bool bLinkOnly : 1; bool bHighlighting : 1; bool m_bColorSelected : 1; Graphic aBgdGraphic; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 2ac62da42ad3..6e82f808fb38 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -316,7 +316,6 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window* pParent, const SfxItemSe , nHtmlMode(0) , bAllowShowSelector(true) , bIsGraphicValid(false) - , bLinkOnly(false) , bHighlighting(false) , m_bColorSelected(false) , pPageImpl(new SvxBackgroundPage_Impl) @@ -894,7 +893,7 @@ void SvxBackgroundTabPage::ShowBitmapUI_Impl() m_pBitmapContainer->Show(); m_pFileFrame->Show(); - m_pBtnLink->Show(!bLinkOnly && !(nHtmlMode & HTMLMODE_ON)); + m_pBtnLink->Show(!(nHtmlMode & HTMLMODE_ON)); m_pTypeFrame->Show(); @@ -1079,7 +1078,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl, Button*, void) OUString aStrBrowse(get<vcl::Window>("findgraphicsft")->GetText()); pImportDlg = new SvxOpenGraphicDialog( aStrBrowse ); - if ( bHtml || bLinkOnly ) + if ( bHtml ) pImportDlg->EnableLink(false); pImportDlg->SetPath( aBgdGraphicPath, m_pBtnLink->IsChecked() ); @@ -1122,7 +1121,7 @@ IMPL_LINK( SvxBackgroundTabPage, LoadIdleHdl_Impl, Timer*, pIdle, void ) // new file chosen aBgdGraphicPath = pImportDlg->GetPath(); aBgdGraphicFilter = pImportDlg->GetCurrentFilter(); - bool bLink = ( nHtmlMode & HTMLMODE_ON ) || bLinkOnly || pImportDlg->IsAsLink(); + bool bLink = ( nHtmlMode & HTMLMODE_ON ) || pImportDlg->IsAsLink(); m_pBtnLink->Check( bLink ); m_pBtnLink->Enable(); |