Kaydet (Commit) 3154770b authored tarafından Caolán McNamara's avatar Caolán McNamara

CreateUndoRemoveObject default arg is always used

Change-Id: I5676281be56ff454962900fe7500d078b1f9e7e9
Reviewed-on: https://gerrit.libreoffice.org/70252
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst dc7fdd7e
...@@ -709,7 +709,7 @@ public: ...@@ -709,7 +709,7 @@ public:
virtual std::unique_ptr<SdrUndoAction> CreateUndoMoveObject( SdrObject& rObject, const Size& rDist ); virtual std::unique_ptr<SdrUndoAction> CreateUndoMoveObject( SdrObject& rObject, const Size& rDist );
virtual std::unique_ptr<SdrUndoAction> CreateUndoGeoObject( SdrObject& rObject ); virtual std::unique_ptr<SdrUndoAction> CreateUndoGeoObject( SdrObject& rObject );
virtual std::unique_ptr<SdrUndoAction> CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1 = false, bool bSaveText = false ); virtual std::unique_ptr<SdrUndoAction> CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1 = false, bool bSaveText = false );
virtual std::unique_ptr<SdrUndoAction> CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect = false); virtual std::unique_ptr<SdrUndoAction> CreateUndoRemoveObject(SdrObject& rObject);
virtual std::unique_ptr<SdrUndoAction> CreateUndoInsertObject( SdrObject& rObject, bool bOrdNumDirect = false); virtual std::unique_ptr<SdrUndoAction> CreateUndoInsertObject( SdrObject& rObject, bool bOrdNumDirect = false);
virtual std::unique_ptr<SdrUndoAction> CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect = false); virtual std::unique_ptr<SdrUndoAction> CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect = false);
virtual std::unique_ptr<SdrUndoAction> CreateUndoNewObject( SdrObject& rObject, bool bOrdNumDirect = false); virtual std::unique_ptr<SdrUndoAction> CreateUndoNewObject( SdrObject& rObject, bool bOrdNumDirect = false);
......
...@@ -38,7 +38,7 @@ namespace rptui ...@@ -38,7 +38,7 @@ namespace rptui
virtual std::unique_ptr<SdrUndoAction> CreateUndoMoveObject( SdrObject& rObject, const Size& rDist ) override; virtual std::unique_ptr<SdrUndoAction> CreateUndoMoveObject( SdrObject& rObject, const Size& rDist ) 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;
virtual std::unique_ptr<SdrUndoAction> CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect = false) override; virtual std::unique_ptr<SdrUndoAction> CreateUndoRemoveObject(SdrObject& rObject) override;
virtual std::unique_ptr<SdrUndoAction> CreateUndoInsertObject( SdrObject& rObject, bool bOrdNumDirect = false) override; virtual std::unique_ptr<SdrUndoAction> CreateUndoInsertObject( SdrObject& rObject, bool bOrdNumDirect = false) 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> CreateUndoNewObject( SdrObject& rObject, bool bOrdNumDirect = false) override; virtual std::unique_ptr<SdrUndoAction> CreateUndoNewObject( SdrObject& rObject, bool bOrdNumDirect = false) override;
......
...@@ -63,9 +63,9 @@ std::unique_ptr<SdrUndoAction> OReportUndoFactory::CreateUndoAttrObject( SdrObje ...@@ -63,9 +63,9 @@ std::unique_ptr<SdrUndoAction> OReportUndoFactory::CreateUndoAttrObject( SdrObje
return m_pUndoFactory->CreateUndoAttrObject( rObject, bStyleSheet1, bSaveText ); return m_pUndoFactory->CreateUndoAttrObject( rObject, bStyleSheet1, bSaveText );
} }
std::unique_ptr<SdrUndoAction> OReportUndoFactory::CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect ) std::unique_ptr<SdrUndoAction> OReportUndoFactory::CreateUndoRemoveObject(SdrObject& rObject)
{ {
return m_pUndoFactory->CreateUndoRemoveObject( rObject, bOrdNumDirect ); return m_pUndoFactory->CreateUndoRemoveObject(rObject);
} }
std::unique_ptr<SdrUndoAction> OReportUndoFactory::CreateUndoInsertObject( SdrObject& rObject, bool /*bOrdNumDirect*/ ) std::unique_ptr<SdrUndoAction> OReportUndoFactory::CreateUndoInsertObject( SdrObject& rObject, bool /*bOrdNumDirect*/ )
......
...@@ -28,7 +28,7 @@ namespace sd ...@@ -28,7 +28,7 @@ namespace sd
class UndoFactory : public SdrUndoFactory class UndoFactory : public SdrUndoFactory
{ {
public: public:
virtual std::unique_ptr<SdrUndoAction> CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect = false) 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, bool bOrdNumDirect = false ) override;
......
...@@ -49,7 +49,7 @@ private: ...@@ -49,7 +49,7 @@ private:
class UndoRemoveObject : public SdrUndoRemoveObj, public UndoRemovePresObjectImpl class UndoRemoveObject : public SdrUndoRemoveObj, public UndoRemovePresObjectImpl
{ {
public: public:
UndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect ); UndoRemoveObject(SdrObject& rObject);
virtual void Undo() override; virtual void Undo() override;
virtual void Redo() override; virtual void Redo() override;
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
using namespace sd; using namespace sd;
std::unique_ptr<SdrUndoAction> UndoFactory::CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect ) std::unique_ptr<SdrUndoAction> UndoFactory::CreateUndoRemoveObject(SdrObject& rObject)
{ {
return std::make_unique<UndoRemoveObject>( rObject, bOrdNumDirect ); return std::make_unique<UndoRemoveObject>(rObject);
} }
std::unique_ptr<SdrUndoAction> UndoFactory::CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect ) std::unique_ptr<SdrUndoAction> UndoFactory::CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect )
......
...@@ -91,8 +91,8 @@ void UndoRemovePresObjectImpl::Redo() ...@@ -91,8 +91,8 @@ void UndoRemovePresObjectImpl::Redo()
mpUndoUsercall->Redo(); mpUndoUsercall->Redo();
} }
UndoRemoveObject::UndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect ) UndoRemoveObject::UndoRemoveObject( SdrObject& rObject )
: SdrUndoRemoveObj( rObject, bOrdNumDirect ), UndoRemovePresObjectImpl( rObject ) : SdrUndoRemoveObj( rObject ), UndoRemovePresObjectImpl( rObject )
, mxSdrObject(&rObject) , mxSdrObject(&rObject)
{ {
} }
......
...@@ -1699,9 +1699,9 @@ std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoAttrObject( SdrObject& ...@@ -1699,9 +1699,9 @@ std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoAttrObject( SdrObject&
return std::make_unique<SdrUndoAttrObj>( rObject, bStyleSheet1, bSaveText ); return std::make_unique<SdrUndoAttrObj>( rObject, bStyleSheet1, bSaveText );
} }
std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect ) std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoRemoveObject(SdrObject& rObject)
{ {
return std::make_unique<SdrUndoRemoveObj>( rObject, bOrdNumDirect ); return std::make_unique<SdrUndoRemoveObj>(rObject);
} }
std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoInsertObject( SdrObject& rObject, bool bOrdNumDirect ) std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoInsertObject( SdrObject& rObject, bool bOrdNumDirect )
......
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