summaryrefslogtreecommitdiff
path: root/sw/source/uibase
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-06-12 13:13:05 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-06-13 08:38:07 +0200
commit6694219526e4d759657aecc49483c518f3d573b1 (patch)
treedb19e3cc03f49c28062b51aabeccdd01528be359 /sw/source/uibase
parentff53b7e475be213a5337e37ba9c8fb73259fb0ad (diff)
loplugin:unusedfields only-used-in-constructor in sw
Change-Id: I942279bdf2774d6c30deae2b2f35cd9edca07efd Reviewed-on: https://gerrit.libreoffice.org/55614 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase')
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControlAcc.cxx6
-rw-r--r--sw/source/uibase/docvw/romenu.cxx4
-rw-r--r--sw/source/uibase/docvw/romenu.hxx3
-rw-r--r--sw/source/uibase/inc/convert.hxx1
-rw-r--r--sw/source/uibase/inc/cption.hxx2
-rw-r--r--sw/source/uibase/inc/frmdlg.hxx1
-rw-r--r--sw/source/uibase/inc/mailmergewizard.hxx1
-rw-r--r--sw/source/uibase/inc/mailmrge.hxx1
-rw-r--r--sw/source/uibase/inc/olmenu.hxx2
-rw-r--r--sw/source/uibase/inc/optload.hxx2
-rw-r--r--sw/source/uibase/inc/regionsw.hxx1
-rw-r--r--sw/source/uibase/inc/swuipardlg.hxx1
-rw-r--r--sw/source/uibase/inc/wrap.hxx2
-rw-r--r--sw/source/uibase/lingu/olmenu.cxx38
14 files changed, 24 insertions, 41 deletions
diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
index 7cab19c264d5..7529bdbfe027 100644
--- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
@@ -146,7 +146,6 @@ class SidebarTextControlAccessibleContext : public VCLXAccessibleComponent
virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
private:
- SidebarTextControl& mrSidebarTextControl;
::accessibility::AccessibleTextHelper* mpAccessibleTextHelper;
::osl::Mutex maMutex;
@@ -156,12 +155,11 @@ class SidebarTextControlAccessibleContext : public VCLXAccessibleComponent
SidebarTextControlAccessibleContext::SidebarTextControlAccessibleContext( SidebarTextControl& rSidebarTextControl )
: VCLXAccessibleComponent( rSidebarTextControl.GetWindowPeer() )
- , mrSidebarTextControl( rSidebarTextControl )
, mpAccessibleTextHelper( nullptr )
, maMutex()
{
- mpAccessibleTextHelper = new ::accessibility::AccessibleTextHelper( o3tl::make_unique<SidebarTextEditSource>(mrSidebarTextControl) );
- mpAccessibleTextHelper->SetEventSource( mrSidebarTextControl.GetWindowPeer() );
+ mpAccessibleTextHelper = new ::accessibility::AccessibleTextHelper( o3tl::make_unique<SidebarTextEditSource>(rSidebarTextControl) );
+ mpAccessibleTextHelper->SetEventSource( rSidebarTextControl.GetWindowPeer() );
}
SidebarTextControlAccessibleContext::~SidebarTextControlAccessibleContext()
diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx
index 16034feee07a..af8a625c55cf 100644
--- a/sw/source/uibase/docvw/romenu.cxx
+++ b/sw/source/uibase/docvw/romenu.cxx
@@ -115,7 +115,8 @@ SwReadOnlyPopup::SwReadOnlyPopup(const Point &rDPos, SwView &rV)
{
m_bGrfToGalleryAsLnk = SW_MOD()->GetModuleConfig()->IsGrfToGalleryAsLnk();
SwWrtShell &rSh = m_rView.GetWrtShell();
- rSh.IsURLGrfAtPos( m_rDocPos, &m_sURL, &m_sTargetFrameName, &m_sDescription );
+ OUString sDescription;
+ rSh.IsURLGrfAtPos( m_rDocPos, &m_sURL, &m_sTargetFrameName, &sDescription );
if ( m_sURL.isEmpty() )
{
SwContentAtPos aContentAtPos( IsAttrAtPos::InetAttr );
@@ -124,7 +125,6 @@ SwReadOnlyPopup::SwReadOnlyPopup(const Point &rDPos, SwView &rV)
const SwFormatINetFormat &rIItem = *static_cast<const SwFormatINetFormat*>(aContentAtPos.aFnd.pAttr);
m_sURL = rIItem.GetValue();
m_sTargetFrameName = rIItem.GetTargetFrame();
- m_sDescription = aContentAtPos.sStr;
}
}
diff --git a/sw/source/uibase/docvw/romenu.hxx b/sw/source/uibase/docvw/romenu.hxx
index 8b0a7fa0badc..7ddf442f7f17 100644
--- a/sw/source/uibase/docvw/romenu.hxx
+++ b/sw/source/uibase/docvw/romenu.hxx
@@ -63,8 +63,7 @@ class SwReadOnlyPopup
const Point &m_rDocPos;
Graphic m_aGraphic;
OUString m_sURL,
- m_sTargetFrameName,
- m_sDescription;
+ m_sTargetFrameName;
OUString m_sGrfName;
std::vector<OUString> m_aThemeList;
bool m_bGrfToGalleryAsLnk;
diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx
index 90d1cfebf715..e62b7cbccad3 100644
--- a/sw/source/uibase/inc/convert.hxx
+++ b/sw/source/uibase/inc/convert.hxx
@@ -47,7 +47,6 @@ class SwConvertTableDlg : public weld::GenericDialogController
std::unique_ptr<weld::CheckButton> m_xDontSplitCB;
std::unique_ptr<weld::Button> m_xAutoFormatBtn;
- OUString sConvertTextTable;
std::unique_ptr<SwTableAutoFormat> mxTAutoFormat;
SwWrtShell* pShell;
diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx
index ded6d36b9dc8..3942fe4e0293 100644
--- a/sw/source/uibase/inc/cption.hxx
+++ b/sw/source/uibase/inc/cption.hxx
@@ -71,10 +71,8 @@ class SwCaptionDialog : public SvxStandardDialog
SwView &rView; // search per active, avoid View
SwFieldMgr *pMgr; // pointer to save the include
- SelectionType eType;
OUString sCharacterStyle;
- OUString sObjectName;
bool bCopyAttributes;
bool bOrderNumberingFirst; //#i61007# order of captions
diff --git a/sw/source/uibase/inc/frmdlg.hxx b/sw/source/uibase/inc/frmdlg.hxx
index 28c8cbbbaaf4..1a05a1ea09c9 100644
--- a/sw/source/uibase/inc/frmdlg.hxx
+++ b/sw/source/uibase/inc/frmdlg.hxx
@@ -29,7 +29,6 @@ class SwFrameDlg : public SfxTabDialog
{
bool m_bFormat;
bool m_bNew;
- bool m_bHTMLMode;
const SfxItemSet& m_rSet;
OUString m_sDlgType;
SwWrtShell* m_pWrtShell;
diff --git a/sw/source/uibase/inc/mailmergewizard.hxx b/sw/source/uibase/inc/mailmergewizard.hxx
index a9d022f0826e..a184216a917a 100644
--- a/sw/source/uibase/inc/mailmergewizard.hxx
+++ b/sw/source/uibase/inc/mailmergewizard.hxx
@@ -45,7 +45,6 @@ class SwMailMergeWizard : public ::svt::RoadmapWizard
OUString m_sAddressList;
OUString m_sGreetingsLine;
OUString m_sLayout;
- OUString m_sFinish;
sal_uInt16 m_nRestartPage;
diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx
index 718353b8b74c..6a2b5bf53566 100644
--- a/sw/source/uibase/inc/mailmrge.hxx
+++ b/sw/source/uibase/inc/mailmrge.hxx
@@ -101,7 +101,6 @@ class SwMailMergeDlg : public SvxStandardDialog
css::uno::Sequence< css::uno::Any > m_aSelection;
css::uno::Reference< css::frame::XFrame2 > m_xFrame;
- Size m_aDialogSize;
OUString m_sSaveFilter;
OUString m_sFilename;
diff --git a/sw/source/uibase/inc/olmenu.hxx b/sw/source/uibase/inc/olmenu.hxx
index d37eb2edbfb5..0f42b7ff05c5 100644
--- a/sw/source/uibase/inc/olmenu.hxx
+++ b/sw/source/uibase/inc/olmenu.hxx
@@ -99,8 +99,6 @@ class SW_DLLPUBLIC SwSpellPopup
OUString m_sExplanationLink;
LanguageType m_nCheckedLanguage;
- LanguageType m_nGuessLangWord;
- LanguageType m_nGuessLangPara;
std::map< sal_Int16, OUString > m_aLangTable_Text;
std::map< sal_Int16, OUString > m_aLangTable_Paragraph;
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index 5b98e6508463..fb84a7b5ff2d 100644
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.hxx
@@ -116,7 +116,6 @@ private:
OUString maText;
bool mbFontInitialized;
vcl::Font maFont;
- Point maDrawPos;
public:
SwCaptionPreview(vcl::Window* pParent, WinBits nStyle);
virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
@@ -157,7 +156,6 @@ private:
OUString m_sOLE;
OUString m_sIllustration;
- OUString m_sFigure;
OUString m_sTable;
OUString m_sText;
OUString m_sDrawing;
diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx
index b2b38edd1125..70f1e5b5e12c 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.hxx
@@ -96,7 +96,6 @@ class SwEditRegionDlg : public SfxModalDialog
sfx2::DocumentInserter* m_pDocInserter;
bool bDontCheckPasswd :1;
- bool bWeb :1;
void RecurseList( const SwSectionFormat* pFormat, SvTreeListEntry* pEntry);
size_t FindArrPos(const SwSectionFormat* pFormat);
diff --git a/sw/source/uibase/inc/swuipardlg.hxx b/sw/source/uibase/inc/swuipardlg.hxx
index 13c0775459dd..ebb5e0e1cc4e 100644
--- a/sw/source/uibase/inc/swuipardlg.hxx
+++ b/sw/source/uibase/inc/swuipardlg.hxx
@@ -24,7 +24,6 @@ class SwParaDlg: public SfxTabDialog
{
SwView& rView;
sal_uInt16 nHtmlMode;
- sal_uInt8 nDlgMode;
bool bDrawParaDlg;
sal_uInt16 m_nParaStd;
diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx
index 1ab9564207dd..c0c34f1b6404 100644
--- a/sw/source/uibase/inc/wrap.hxx
+++ b/sw/source/uibase/inc/wrap.hxx
@@ -31,8 +31,6 @@ class SwWrtShell;
class SwWrapDlg : public SfxSingleTabDialog
{
- SwWrtShell* pWrtShell;
-
public:
SwWrapDlg(vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode);
};
diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index a4ede37f35a4..111b4e9703a8 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -305,20 +305,20 @@ SwSpellPopup::SwSpellPopup(
m_xPopupMenu->EnableItem(m_nCorrectMenuId, bEnable);
uno::Reference< linguistic2::XLanguageGuessing > xLG = SW_MOD()->GetLanguageGuesser();
- m_nGuessLangWord = LANGUAGE_NONE;
- m_nGuessLangPara = LANGUAGE_NONE;
+ LanguageType nGuessLangWord = LANGUAGE_NONE;
+ LanguageType nGuessLangPara = LANGUAGE_NONE;
if (m_xSpellAlt.is() && xLG.is())
{
- m_nGuessLangWord = EditView::CheckLanguage( m_xSpellAlt->getWord(), ::GetSpellChecker(), xLG, false );
- m_nGuessLangPara = EditView::CheckLanguage( rParaText, ::GetSpellChecker(), xLG, true );
+ nGuessLangWord = EditView::CheckLanguage( m_xSpellAlt->getWord(), ::GetSpellChecker(), xLG, false );
+ nGuessLangPara = EditView::CheckLanguage( rParaText, ::GetSpellChecker(), xLG, true );
}
- if (m_nGuessLangWord != LANGUAGE_NONE || m_nGuessLangPara != LANGUAGE_NONE)
+ if (nGuessLangWord != LANGUAGE_NONE || nGuessLangPara != LANGUAGE_NONE)
{
// make sure LANGUAGE_NONE gets not used as menu entry
- if (m_nGuessLangWord == LANGUAGE_NONE)
- m_nGuessLangWord = m_nGuessLangPara;
- if (m_nGuessLangPara == LANGUAGE_NONE)
- m_nGuessLangPara = m_nGuessLangWord;
+ if (nGuessLangWord == LANGUAGE_NONE)
+ nGuessLangWord = nGuessLangPara;
+ if (nGuessLangPara == LANGUAGE_NONE)
+ nGuessLangPara = nGuessLangWord;
}
pMenu = m_xPopupMenu->GetPopupMenu(m_nAddMenuId);
@@ -400,7 +400,7 @@ SwSpellPopup::SwSpellPopup(
aSeq[0] = aCurrentLang;
aSeq[1] = aScriptTypesInUse;
aSeq[2] = aKeyboardLang;
- aSeq[3] = SvtLanguageTable::GetLanguageString(m_nGuessLangWord);
+ aSeq[3] = SvtLanguageTable::GetLanguageString(nGuessLangWord);
pMenu = m_xPopupMenu->GetPopupMenu(m_nLangSelectionMenuId);
fillLangPopupMenu( pMenu, MN_SET_LANGUAGE_SELECTION_START, aSeq, pWrtSh, m_aLangTable_Text );
@@ -522,19 +522,19 @@ SwSpellPopup::SwSpellPopup(
m_xPopupMenu->EnableItem(m_nCorrectDialogId, false);
uno::Reference< linguistic2::XLanguageGuessing > xLG = SW_MOD()->GetLanguageGuesser();
- m_nGuessLangWord = LANGUAGE_NONE;
- m_nGuessLangPara = LANGUAGE_NONE;
+ LanguageType nGuessLangWord = LANGUAGE_NONE;
+ LanguageType nGuessLangPara = LANGUAGE_NONE;
if (xLG.is())
{
- m_nGuessLangPara = EditView::CheckLanguage( rParaText, ::GetSpellChecker(), xLG, true );
+ nGuessLangPara = EditView::CheckLanguage( rParaText, ::GetSpellChecker(), xLG, true );
}
- if (m_nGuessLangWord != LANGUAGE_NONE || m_nGuessLangPara != LANGUAGE_NONE)
+ if (nGuessLangWord != LANGUAGE_NONE || nGuessLangPara != LANGUAGE_NONE)
{
// make sure LANGUAGE_NONE gets not used as menu entry
- if (m_nGuessLangWord == LANGUAGE_NONE)
- m_nGuessLangWord = m_nGuessLangPara;
- if (m_nGuessLangPara == LANGUAGE_NONE)
- m_nGuessLangPara = m_nGuessLangWord;
+ if (nGuessLangWord == LANGUAGE_NONE)
+ nGuessLangWord = nGuessLangPara;
+ if (nGuessLangPara == LANGUAGE_NONE)
+ nGuessLangPara = nGuessLangWord;
}
m_xPopupMenu->EnableItem(m_nAddMenuId, false);
@@ -562,7 +562,7 @@ SwSpellPopup::SwSpellPopup(
aSeq[0] = aCurrentLang;
aSeq[1] = aScriptTypesInUse;
aSeq[2] = aKeyboardLang;
- aSeq[3] = SvtLanguageTable::GetLanguageString(m_nGuessLangWord);
+ aSeq[3] = SvtLanguageTable::GetLanguageString(nGuessLangWord);
PopupMenu *pMenu = m_xPopupMenu->GetPopupMenu(m_nLangSelectionMenuId);
fillLangPopupMenu( pMenu, MN_SET_LANGUAGE_SELECTION_START, aSeq, pWrtSh, m_aLangTable_Text );