Kaydet (Commit) 3fe3bd8a authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unusedfields

Change-Id: I321c8eefdc43979ef5fd3774c7094ac0dbcac417
Reviewed-on: https://gerrit.libreoffice.org/70657
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 3f42a9cf
...@@ -158,7 +158,6 @@ struct UpdateDialog::SpecificError { ...@@ -158,7 +158,6 @@ struct UpdateDialog::SpecificError {
struct UpdateDialog::IgnoredUpdate { struct UpdateDialog::IgnoredUpdate {
OUString sExtensionID; OUString sExtensionID;
OUString sVersion; OUString sVersion;
bool bRemoved;
IgnoredUpdate( const OUString &rExtensionID, const OUString &rVersion ); IgnoredUpdate( const OUString &rExtensionID, const OUString &rVersion );
}; };
...@@ -166,8 +165,7 @@ struct UpdateDialog::IgnoredUpdate { ...@@ -166,8 +165,7 @@ struct UpdateDialog::IgnoredUpdate {
UpdateDialog::IgnoredUpdate::IgnoredUpdate( const OUString &rExtensionID, const OUString &rVersion ): UpdateDialog::IgnoredUpdate::IgnoredUpdate( const OUString &rExtensionID, const OUString &rVersion ):
sExtensionID( rExtensionID ), sExtensionID( rExtensionID ),
sVersion( rVersion ), sVersion( rVersion )
bRemoved( false )
{} {}
...@@ -889,8 +887,6 @@ bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index ) ...@@ -889,8 +887,6 @@ bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index )
bIsIgnored = true; bIsIgnored = true;
index->m_bIgnored = true; index->m_bIgnored = true;
} }
else // when we find another update of an ignored version, we will remove the old one to keep the ignored list small
ignoredUpdate->bRemoved = true;
break; break;
} }
} }
......
...@@ -75,10 +75,8 @@ public: ...@@ -75,10 +75,8 @@ public:
protected: protected:
Image m_aNotCheckedImage; Image m_aNotCheckedImage;
Image m_aCheckedImage; Image m_aCheckedImage;
OUString m_aAllString;
std::unique_ptr<css::uno::Sequence< sal_Int16 >> std::unique_ptr<css::uno::Sequence< sal_Int16 >>
m_pSpellUsedLang; m_pSpellUsedLang;
bool m_bHasLangNone;
bool m_bWithCheckmark; bool m_bWithCheckmark;
SVX_DLLPRIVATE void ImplLanguageBoxBaseInit(); SVX_DLLPRIVATE void ImplLanguageBoxBaseInit();
......
...@@ -333,11 +333,10 @@ class SVX_DLLPUBLIC SdrUndoReplaceObj : public SdrUndoObj ...@@ -333,11 +333,10 @@ class SVX_DLLPUBLIC SdrUndoReplaceObj : public SdrUndoObj
bool bNewOwner; bool bNewOwner;
SdrObjList* pObjList; SdrObjList* pObjList;
sal_uInt32 nOrdNum;
SdrObject* pNewObj; SdrObject* pNewObj;
public: public:
SdrUndoReplaceObj(SdrObject& rOldObj1, SdrObject& rNewObj1, bool bOrdNumDirect); SdrUndoReplaceObj(SdrObject& rOldObj1, SdrObject& rNewObj1);
virtual ~SdrUndoReplaceObj() override; virtual ~SdrUndoReplaceObj() override;
virtual void Undo() override; virtual void Undo() override;
...@@ -717,7 +716,7 @@ public: ...@@ -717,7 +716,7 @@ public:
virtual std::unique_ptr<SdrUndoAction> CreateUndoObjectOrdNum( SdrObject& rObject, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1); virtual std::unique_ptr<SdrUndoAction> CreateUndoObjectOrdNum( SdrObject& rObject, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1);
virtual std::unique_ptr<SdrUndoAction> CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect = false ); virtual std::unique_ptr<SdrUndoAction> CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject );
virtual std::unique_ptr<SdrUndoAction> CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer ); virtual std::unique_ptr<SdrUndoAction> CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer );
virtual std::unique_ptr<SdrUndoAction> CreateUndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText ); virtual std::unique_ptr<SdrUndoAction> CreateUndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText );
......
...@@ -46,7 +46,7 @@ namespace rptui ...@@ -46,7 +46,7 @@ namespace rptui
virtual std::unique_ptr<SdrUndoAction> CreateUndoObjectOrdNum( SdrObject& rObject, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1) override; virtual std::unique_ptr<SdrUndoAction> CreateUndoObjectOrdNum( SdrObject& rObject, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1) override;
virtual std::unique_ptr<SdrUndoAction> CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect = false ) override; virtual std::unique_ptr<SdrUndoAction> CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject ) override;
virtual std::unique_ptr<SdrUndoAction> CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer ) override; virtual std::unique_ptr<SdrUndoAction> CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer ) override;
virtual std::unique_ptr<SdrUndoAction> CreateUndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText ) override; virtual std::unique_ptr<SdrUndoAction> CreateUndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText ) override;
......
...@@ -93,9 +93,9 @@ std::unique_ptr<SdrUndoAction> OReportUndoFactory::CreateUndoObjectOrdNum( SdrOb ...@@ -93,9 +93,9 @@ std::unique_ptr<SdrUndoAction> OReportUndoFactory::CreateUndoObjectOrdNum( SdrOb
return m_pUndoFactory->CreateUndoObjectOrdNum( rObject, nOldOrdNum1, nNewOrdNum1 ); return m_pUndoFactory->CreateUndoObjectOrdNum( rObject, nOldOrdNum1, nNewOrdNum1 );
} }
std::unique_ptr<SdrUndoAction> OReportUndoFactory::CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect ) std::unique_ptr<SdrUndoAction> OReportUndoFactory::CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject )
{ {
return m_pUndoFactory->CreateUndoReplaceObject( rOldObject, rNewObject, bOrdNumDirect ); return m_pUndoFactory->CreateUndoReplaceObject( rOldObject, rNewObject );
} }
std::unique_ptr<SdrUndoAction> OReportUndoFactory::CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer ) std::unique_ptr<SdrUndoAction> OReportUndoFactory::CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer )
......
...@@ -35,7 +35,6 @@ private: ...@@ -35,7 +35,6 @@ private:
ScRange theCurArea; ScRange theCurArea;
bool bCloseFlag; bool bCloseFlag;
bool bAutoReOpen;
bool bCloseOnButtonUp; bool bCloseOnButtonUp;
bool bSingleCell; bool bSingleCell;
bool bMultiSelection; bool bMultiSelection;
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent) ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent)
: ScAnyRefDlgController(pB, pCW, pParent, "modules/scalc/ui/simplerefdialog.ui", "SimpleRefDialog") : ScAnyRefDlgController(pB, pCW, pParent, "modules/scalc/ui/simplerefdialog.ui", "SimpleRefDialog")
, bAutoReOpen(true)
, bCloseOnButtonUp(false) , bCloseOnButtonUp(false)
, bSingleCell(false) , bSingleCell(false)
, bMultiSelection(false) , bMultiSelection(false)
...@@ -159,7 +158,6 @@ void ScSimpleRefDlg::RefInputDone( bool bForced) ...@@ -159,7 +158,6 @@ void ScSimpleRefDlg::RefInputDone( bool bForced)
IMPL_LINK_NOARG(ScSimpleRefDlg, OkBtnHdl, weld::Button&, void) IMPL_LINK_NOARG(ScSimpleRefDlg, OkBtnHdl, weld::Button&, void)
{ {
bAutoReOpen=false;
OUString aResult=m_xEdAssign->GetText(); OUString aResult=m_xEdAssign->GetText();
aCloseHdl.Call(&aResult); aCloseHdl.Call(&aResult);
Link<const OUString&,void> aUnoLink = aDoneHdl; // stack var because this is deleted in DoClose Link<const OUString&,void> aUnoLink = aDoneHdl; // stack var because this is deleted in DoClose
...@@ -169,7 +167,6 @@ IMPL_LINK_NOARG(ScSimpleRefDlg, OkBtnHdl, weld::Button&, void) ...@@ -169,7 +167,6 @@ IMPL_LINK_NOARG(ScSimpleRefDlg, OkBtnHdl, weld::Button&, void)
IMPL_LINK_NOARG(ScSimpleRefDlg, CancelBtnHdl, weld::Button&, void) IMPL_LINK_NOARG(ScSimpleRefDlg, CancelBtnHdl, weld::Button&, void)
{ {
bAutoReOpen=false;
OUString aResult=m_xEdAssign->GetText(); OUString aResult=m_xEdAssign->GetText();
aCloseHdl.Call(nullptr); aCloseHdl.Call(nullptr);
Link<const OUString&,void> aUnoLink = aAbortedHdl; // stack var because this is deleted in DoClose Link<const OUString&,void> aUnoLink = aAbortedHdl; // stack var because this is deleted in DoClose
......
...@@ -31,7 +31,7 @@ public: ...@@ -31,7 +31,7 @@ public:
virtual std::unique_ptr<SdrUndoAction> CreateUndoRemoveObject(SdrObject& rObject) override; virtual std::unique_ptr<SdrUndoAction> CreateUndoRemoveObject(SdrObject& rObject) override;
virtual std::unique_ptr<SdrUndoAction> CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect = false) override; virtual std::unique_ptr<SdrUndoAction> CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect = false) override;
virtual std::unique_ptr<SdrUndoAction> CreateUndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText ) override; virtual std::unique_ptr<SdrUndoAction> CreateUndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText ) override;
virtual std::unique_ptr<SdrUndoAction> CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect = false ) override; virtual std::unique_ptr<SdrUndoAction> CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject ) override;
virtual std::unique_ptr<SdrUndoAction> CreateUndoGeoObject( SdrObject& rObject ) override; virtual std::unique_ptr<SdrUndoAction> CreateUndoGeoObject( SdrObject& rObject ) override;
virtual std::unique_ptr<SdrUndoAction> CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1 = false, bool bSaveText = false ) override; virtual std::unique_ptr<SdrUndoAction> CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1 = false, bool bSaveText = false ) override;
}; };
......
...@@ -73,7 +73,7 @@ private: ...@@ -73,7 +73,7 @@ private:
class UndoReplaceObject : public SdrUndoReplaceObj, public UndoRemovePresObjectImpl class UndoReplaceObject : public SdrUndoReplaceObj, public UndoRemovePresObjectImpl
{ {
public: public:
UndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect ); UndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject );
virtual void Undo() override; virtual void Undo() override;
virtual void Redo() override; virtual void Redo() override;
......
...@@ -37,9 +37,9 @@ std::unique_ptr<SdrUndoAction> UndoFactory::CreateUndoObjectSetText( SdrObject& ...@@ -37,9 +37,9 @@ std::unique_ptr<SdrUndoAction> UndoFactory::CreateUndoObjectSetText( SdrObject&
return std::make_unique<UndoObjectSetText>( rNewObj, nText ); return std::make_unique<UndoObjectSetText>( rNewObj, nText );
} }
std::unique_ptr<SdrUndoAction> UndoFactory::CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect ) std::unique_ptr<SdrUndoAction> UndoFactory::CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject )
{ {
return std::make_unique<UndoReplaceObject>( rOldObject, rNewObject, bOrdNumDirect ); return std::make_unique<UndoReplaceObject>( rOldObject, rNewObject );
} }
std::unique_ptr<SdrUndoAction> UndoFactory::CreateUndoGeoObject( SdrObject& rObject ) std::unique_ptr<SdrUndoAction> UndoFactory::CreateUndoGeoObject( SdrObject& rObject )
......
...@@ -144,8 +144,8 @@ void UndoDeleteObject::Redo() ...@@ -144,8 +144,8 @@ void UndoDeleteObject::Redo()
} }
} }
UndoReplaceObject::UndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect ) UndoReplaceObject::UndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject )
: SdrUndoReplaceObj( rOldObject, rNewObject, bOrdNumDirect ) : SdrUndoReplaceObj( rOldObject, rNewObject )
, UndoRemovePresObjectImpl( rOldObject ) , UndoRemovePresObjectImpl( rOldObject )
, mxSdrObject( &rOldObject ) , mxSdrObject( &rOldObject )
{ {
......
...@@ -132,8 +132,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void makeSvxLanguageComboBox(VclPtr<vcl::Window> ...@@ -132,8 +132,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void makeSvxLanguageComboBox(VclPtr<vcl::Window>
} }
SvxLanguageBoxBase::SvxLanguageBoxBase() SvxLanguageBoxBase::SvxLanguageBoxBase()
: m_bHasLangNone(false) : m_bWithCheckmark(false)
, m_bWithCheckmark(false)
{ {
} }
...@@ -141,8 +140,6 @@ void SvxLanguageBoxBase::ImplLanguageBoxBaseInit() ...@@ -141,8 +140,6 @@ void SvxLanguageBoxBase::ImplLanguageBoxBaseInit()
{ {
m_aNotCheckedImage = Image(StockImage::Yes, RID_SVXBMP_NOTCHECKED); m_aNotCheckedImage = Image(StockImage::Yes, RID_SVXBMP_NOTCHECKED);
m_aCheckedImage = Image(StockImage::Yes, RID_SVXBMP_CHECKED); m_aCheckedImage = Image(StockImage::Yes, RID_SVXBMP_CHECKED);
m_aAllString = SvxResId( RID_SVXSTR_LANGUAGE_ALL );
m_bHasLangNone = false;
if ( m_bWithCheckmark ) if ( m_bWithCheckmark )
{ {
...@@ -218,7 +215,6 @@ void SvxLanguageBoxBase::SetLanguageList( SvxLanguageListFlags nLangList, ...@@ -218,7 +215,6 @@ void SvxLanguageBoxBase::SetLanguageList( SvxLanguageListFlags nLangList,
{ {
ImplClear(); ImplClear();
m_bHasLangNone = bHasLangNone;
m_bWithCheckmark = bCheckSpellAvail; m_bWithCheckmark = bCheckSpellAvail;
if ( SvxLanguageListFlags::EMPTY == nLangList ) if ( SvxLanguageListFlags::EMPTY == nLangList )
......
...@@ -833,23 +833,14 @@ OUString SdrUndoNewObj::GetComment() const ...@@ -833,23 +833,14 @@ OUString SdrUndoNewObj::GetComment() const
return aStr; return aStr;
} }
SdrUndoReplaceObj::SdrUndoReplaceObj(SdrObject& rOldObj1, SdrObject& rNewObj1, bool bOrdNumDirect) SdrUndoReplaceObj::SdrUndoReplaceObj(SdrObject& rOldObj1, SdrObject& rNewObj1)
: SdrUndoObj(rOldObj1) : SdrUndoObj(rOldObj1)
, bOldOwner(false) , bOldOwner(false)
, bNewOwner(false) , bNewOwner(false)
, pNewObj(&rNewObj1) , pNewObj(&rNewObj1)
{ {
SetOldOwner(true); SetOldOwner(true);
pObjList=pObj->getParentSdrObjListFromSdrObject(); pObjList=pObj->getParentSdrObjListFromSdrObject();
if (bOrdNumDirect)
{
nOrdNum=pObj->GetOrdNumDirect();
}
else
{
nOrdNum=pObj->GetOrdNum();
}
} }
SdrUndoReplaceObj::~SdrUndoReplaceObj() SdrUndoReplaceObj::~SdrUndoReplaceObj()
...@@ -1729,9 +1720,9 @@ std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoObjectOrdNum( SdrObject ...@@ -1729,9 +1720,9 @@ std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoObjectOrdNum( SdrObject
return std::make_unique<SdrUndoObjOrdNum>( rObject, nOldOrdNum1, nNewOrdNum1 ); return std::make_unique<SdrUndoObjOrdNum>( rObject, nOldOrdNum1, nNewOrdNum1 );
} }
std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect ) std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject )
{ {
return std::make_unique<SdrUndoReplaceObj>( rOldObject, rNewObject, bOrdNumDirect ); return std::make_unique<SdrUndoReplaceObj>( rOldObject, rNewObject );
} }
std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer ) std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer )
......
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