Kaydet (Commit) 216879f1 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unusedfields in cui

Change-Id: I92d7c3e2dde0808304ee3877ba1fbd13ee63eb38
üst 048f3960
...@@ -366,7 +366,6 @@ struct SvxConfigGroupBoxResource_Impl : public Resource ...@@ -366,7 +366,6 @@ struct SvxConfigGroupBoxResource_Impl : public Resource
OUString m_sProdMacros; OUString m_sProdMacros;
OUString m_sMacros; OUString m_sMacros;
OUString m_sDlgMacros; OUString m_sDlgMacros;
OUString m_aHumanAppName;
OUString m_aStrGroupStyles; OUString m_aStrGroupStyles;
Image m_collapsedImage; Image m_collapsedImage;
Image m_expandedImage; Image m_expandedImage;
...@@ -384,7 +383,6 @@ SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() : ...@@ -384,7 +383,6 @@ SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)), m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)),
m_sMacros(CUI_RESSTR(STR_BASICMACROS)), m_sMacros(CUI_RESSTR(STR_BASICMACROS)),
m_sDlgMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)), m_sDlgMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)),
m_aHumanAppName(CUI_RESSTR(STR_HUMAN_APPNAME)),
m_aStrGroupStyles(CUI_RESSTR(STR_GROUP_STYLES)), m_aStrGroupStyles(CUI_RESSTR(STR_GROUP_STYLES)),
m_collapsedImage(CUI_RES(BMP_COLLAPSED)), m_collapsedImage(CUI_RES(BMP_COLLAPSED)),
m_expandedImage(CUI_RES(BMP_EXPANDED)) m_expandedImage(CUI_RES(BMP_EXPANDED))
......
...@@ -41,7 +41,6 @@ struct SpellErrorDescription ...@@ -41,7 +41,6 @@ struct SpellErrorDescription
OUString sExplanationURL; OUString sExplanationURL;
css::lang::Locale aLocale; css::lang::Locale aLocale;
css::uno::Reference< css::linguistic2::XProofreader > xGrammarChecker; css::uno::Reference< css::linguistic2::XProofreader > xGrammarChecker;
OUString sServiceName; ///< service name of GrammarChecker/SpellChecker
css::uno::Sequence< OUString > aSuggestions; css::uno::Sequence< OUString > aSuggestions;
OUString sRuleId; OUString sRuleId;
...@@ -53,7 +52,6 @@ struct SpellErrorDescription ...@@ -53,7 +52,6 @@ struct SpellErrorDescription
const css::lang::Locale& rLocale, const css::lang::Locale& rLocale,
const css::uno::Sequence< OUString >& rSuggestions, const css::uno::Sequence< OUString >& rSuggestions,
css::uno::Reference< css::linguistic2::XProofreader > rxGrammarChecker, css::uno::Reference< css::linguistic2::XProofreader > rxGrammarChecker,
const OUString& rServiceName,
const OUString* pDialogTitle = nullptr, const OUString* pDialogTitle = nullptr,
const OUString* pExplanation = nullptr, const OUString* pExplanation = nullptr,
const OUString* pRuleId = nullptr, const OUString* pRuleId = nullptr,
...@@ -65,7 +63,6 @@ struct SpellErrorDescription ...@@ -65,7 +63,6 @@ struct SpellErrorDescription
sExplanationURL( ), sExplanationURL( ),
aLocale( rLocale ), aLocale( rLocale ),
xGrammarChecker( rxGrammarChecker ), xGrammarChecker( rxGrammarChecker ),
sServiceName( rServiceName ),
aSuggestions( rSuggestions ) aSuggestions( rSuggestions )
{ {
if( pDialogTitle ) if( pDialogTitle )
......
...@@ -1105,7 +1105,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) ...@@ -1105,7 +1105,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck)
if( xNamed.is() ) if( xNamed.is() )
sServiceName = xNamed->getName(); sServiceName = xNamed->getName();
SpellErrorDescription aDesc( false, aStart->xAlternatives->getWord(), SpellErrorDescription aDesc( false, aStart->xAlternatives->getWord(),
aStart->xAlternatives->getLocale(), aStart->xAlternatives->getAlternatives(), nullptr, sServiceName); aStart->xAlternatives->getLocale(), aStart->xAlternatives->getAlternatives(), nullptr);
m_pSentenceED->SetAttrib( SpellErrorAttrib(aDesc), 0, (sal_uInt16) nStartPosition, (sal_uInt16) nEndPosition ); m_pSentenceED->SetAttrib( SpellErrorAttrib(aDesc), 0, (sal_uInt16) nStartPosition, (sal_uInt16) nEndPosition );
} }
else if(aStart->bIsGrammarError ) else if(aStart->bIsGrammarError )
...@@ -1129,7 +1129,6 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) ...@@ -1129,7 +1129,6 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck)
LanguageTag::convertToLocale( aStart->eLanguage ), LanguageTag::convertToLocale( aStart->eLanguage ),
aStart->aGrammarError.aSuggestions, aStart->aGrammarError.aSuggestions,
aStart->xGrammarChecker, aStart->xGrammarChecker,
xInfo->getImplementationName(),
&aStart->sDialogTitle, &aStart->sDialogTitle,
&aStart->aGrammarError.aFullComment, &aStart->aGrammarError.aFullComment,
&aStart->aGrammarError.aRuleIdentifier, &aStart->aGrammarError.aRuleIdentifier,
...@@ -1801,7 +1800,7 @@ void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xA ...@@ -1801,7 +1800,7 @@ void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xA
if (xNamed.is()) if (xNamed.is())
sServiceName = xNamed->getName(); sServiceName = xNamed->getName();
} }
SpellErrorDescription aDesc( false, aWord, aLocale, aAlts, nullptr, sServiceName); SpellErrorDescription aDesc( false, aWord, aLocale, aAlts, nullptr);
GetTextEngine()->SetAttrib( SpellErrorAttrib(aDesc), 0, m_nErrorStart, m_nErrorEnd ); GetTextEngine()->SetAttrib( SpellErrorAttrib(aDesc), 0, m_nErrorStart, m_nErrorEnd );
} }
......
...@@ -671,8 +671,6 @@ public: ...@@ -671,8 +671,6 @@ public:
struct SvxIconSelectorToolBoxItem struct SvxIconSelectorToolBoxItem
{ {
Image aImg; Image aImg;
OUString aText;
void* pData;
}; };
class SvxIconSelectorDialog : public ModalDialog class SvxIconSelectorDialog : public ModalDialog
......
...@@ -153,7 +153,6 @@ protected: ...@@ -153,7 +153,6 @@ protected:
const OUString m_createDupStr; const OUString m_createDupStr;
const OUString m_createErrTitleStr; const OUString m_createErrTitleStr;
const OUString m_renameErrStr; const OUString m_renameErrStr;
const OUString m_renameDupStr;
const OUString m_renameErrTitleStr; const OUString m_renameErrTitleStr;
DECL_LINK_TYPED( ScriptSelectHdl, SvTreeListBox *, void ); DECL_LINK_TYPED( ScriptSelectHdl, SvTreeListBox *, void );
......
...@@ -42,31 +42,27 @@ struct OrderedEntry ...@@ -42,31 +42,27 @@ struct OrderedEntry
struct Module struct Module
{ {
OUString m_sName;
bool m_bActive; bool m_bActive;
std::vector< OrderedEntry* > m_aNodeList; std::vector< OrderedEntry* > m_aNodeList;
Module( const OUString& rName ) : m_sName( rName ), m_bActive( false ) {} Module() : m_bActive( false ) {}
}; };
// struct OptionsLeaf ---------------------------------------------------- // struct OptionsLeaf ----------------------------------------------------
struct OptionsLeaf struct OptionsLeaf
{ {
OUString m_sId;
OUString m_sLabel; OUString m_sLabel;
OUString m_sPageURL; OUString m_sPageURL;
OUString m_sEventHdl; OUString m_sEventHdl;
OUString m_sGroupId; OUString m_sGroupId;
sal_Int32 m_nGroupIndex; sal_Int32 m_nGroupIndex;
OptionsLeaf( const OUString& rId, OptionsLeaf( const OUString& rLabel,
const OUString& rLabel,
const OUString& rPageURL, const OUString& rPageURL,
const OUString& rEventHdl, const OUString& rEventHdl,
const OUString& rGroupId, const OUString& rGroupId,
sal_Int32 nGroupIndex ) : sal_Int32 nGroupIndex ) :
m_sId( rId ),
m_sLabel( rLabel ), m_sLabel( rLabel ),
m_sPageURL( rPageURL ), m_sPageURL( rPageURL ),
m_sEventHdl( rEventHdl ), m_sEventHdl( rEventHdl ),
...@@ -84,8 +80,6 @@ struct OptionsNode ...@@ -84,8 +80,6 @@ struct OptionsNode
OUString m_sLabel; OUString m_sLabel;
OUString m_sPageURL; OUString m_sPageURL;
bool m_bAllModules; bool m_bAllModules;
OUString m_sGroupId;
sal_Int32 m_nGroupIndex;
VectorOfLeaves m_aLeaves; VectorOfLeaves m_aLeaves;
::std::vector< VectorOfLeaves > ::std::vector< VectorOfLeaves >
m_aGroupedLeaves; m_aGroupedLeaves;
...@@ -93,15 +87,11 @@ struct OptionsNode ...@@ -93,15 +87,11 @@ struct OptionsNode
OptionsNode( const OUString& rId, OptionsNode( const OUString& rId,
const OUString& rLabel, const OUString& rLabel,
const OUString& rPageURL, const OUString& rPageURL,
bool bAllModules, bool bAllModules ) :
const OUString& rGroupId,
sal_Int32 nGroupIndex ) :
m_sId( rId ), m_sId( rId ),
m_sLabel( rLabel ), m_sLabel( rLabel ),
m_sPageURL( rPageURL ), m_sPageURL( rPageURL ),
m_bAllModules( bAllModules ), m_bAllModules( bAllModules ) {}
m_sGroupId( rGroupId ),
m_nGroupIndex( nGroupIndex ) {}
~OptionsNode() ~OptionsNode()
{ {
......
...@@ -1870,7 +1870,7 @@ Module* OfaTreeOptionsDialog::LoadModule( ...@@ -1870,7 +1870,7 @@ Module* OfaTreeOptionsDialog::LoadModule(
if ( rModuleIdentifier == sModule ) if ( rModuleIdentifier == sModule )
{ {
// current active module found // current active module found
pModule = new Module( sModule ); pModule = new Module;
pModule->m_bActive = true; pModule->m_bActive = true;
Reference< XNameAccess > xModAccess; Reference< XNameAccess > xModAccess;
...@@ -1955,7 +1955,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes( ...@@ -1955,7 +1955,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes(
if ( !sTemp.isEmpty() ) if ( !sTemp.isEmpty() )
sLabel = sTemp; sLabel = sTemp;
OptionsNode* pNode = OptionsNode* pNode =
new OptionsNode( sNodeId, sLabel, sPageURL, bAllModules, sGroupId, nGroupIndex ); new OptionsNode( sNodeId, sLabel, sPageURL, bAllModules );
if ( rExtensionId.isEmpty() && !isNodeActive( pNode, pModule ) ) if ( rExtensionId.isEmpty() && !isNodeActive( pNode, pModule ) )
{ {
...@@ -1988,7 +1988,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes( ...@@ -1988,7 +1988,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes(
if ( rExtensionId.isEmpty() || sId == rExtensionId ) if ( rExtensionId.isEmpty() || sId == rExtensionId )
{ {
OptionsLeaf* pLeaf = new OptionsLeaf( OptionsLeaf* pLeaf = new OptionsLeaf(
sId, sLeafLabel, sLeafURL, sEventHdl, sLeafGrpId, nLeafGrpIdx ); sLeafLabel, sLeafURL, sEventHdl, sLeafGrpId, nLeafGrpIdx );
if ( !sLeafGrpId.isEmpty() ) if ( !sLeafGrpId.isEmpty() )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment