include/svx/svdundo.hxx | 2 +-
reportdesign/source/core/inc/ReportUndoFactory.hxx | 2 +-
reportdesign/source/core/sdr/ReportUndoFactory.cxx | 4 ++--
sd/inc/undo/undofactory.hxx | 2 +-
sd/inc/undo/undoobjects.hxx | 2 +-
sd/source/core/undo/undofactory.cxx | 4 ++--
sd/source/core/undo/undoobjects.cxx | 4 ++--
svx/source/svdraw/svdundo.cxx | 4 ++--
8 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 3154770b49f84981432ccc3756ceb1840ff8d8a0
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Apr 4 12:27:30 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Apr 4 15:11:34 2019 +0200
CreateUndoRemoveObject default arg is always used
Change-Id: I5676281be56ff454962900fe7500d078b1f9e7e9
Reviewed-on: https://gerrit.libreoffice.org/70252
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index 0e30f39c4661..9c89285f7da2 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -709,7 +709,7 @@ public:
virtual std::unique_ptr<SdrUndoAction> CreateUndoMoveObject( SdrObject&
rObject, const Size& rDist );
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> 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> CreateUndoDeleteObject( SdrObject&
rObject, bool bOrdNumDirect = false);
virtual std::unique_ptr<SdrUndoAction> CreateUndoNewObject( SdrObject&
rObject, bool bOrdNumDirect = false);
diff --git a/reportdesign/source/core/inc/ReportUndoFactory.hxx
b/reportdesign/source/core/inc/ReportUndoFactory.hxx
index 501bf68140b3..473f8ebe90c7 100644
--- a/reportdesign/source/core/inc/ReportUndoFactory.hxx
+++ b/reportdesign/source/core/inc/ReportUndoFactory.hxx
@@ -38,7 +38,7 @@ namespace rptui
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> 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> CreateUndoDeleteObject(
SdrObject& rObject, bool bOrdNumDirect = false) override;
virtual std::unique_ptr<SdrUndoAction> CreateUndoNewObject( SdrObject&
rObject, bool bOrdNumDirect = false) override;
diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx
b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
index 3ceba3851749..068e8ca8dcad 100644
--- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx
+++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
@@ -63,9 +63,9 @@ std::unique_ptr<SdrUndoAction>
OReportUndoFactory::CreateUndoAttrObject( SdrObje
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*/ )
diff --git a/sd/inc/undo/undofactory.hxx b/sd/inc/undo/undofactory.hxx
index 742d0b358e76..e06f1e9ae029 100644
--- a/sd/inc/undo/undofactory.hxx
+++ b/sd/inc/undo/undofactory.hxx
@@ -28,7 +28,7 @@ namespace sd
class UndoFactory : public SdrUndoFactory
{
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> CreateUndoObjectSetText( SdrObject&
rNewObj, sal_Int32 nText ) override;
virtual std::unique_ptr<SdrUndoAction> CreateUndoReplaceObject( SdrObject&
rOldObject, SdrObject& rNewObject, bool bOrdNumDirect = false ) override;
diff --git a/sd/inc/undo/undoobjects.hxx b/sd/inc/undo/undoobjects.hxx
index 5121bc40c5f7..ad2f3d63fb00 100644
--- a/sd/inc/undo/undoobjects.hxx
+++ b/sd/inc/undo/undoobjects.hxx
@@ -49,7 +49,7 @@ private:
class UndoRemoveObject : public SdrUndoRemoveObj, public
UndoRemovePresObjectImpl
{
public:
- UndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect );
+ UndoRemoveObject(SdrObject& rObject);
virtual void Undo() override;
virtual void Redo() override;
diff --git a/sd/source/core/undo/undofactory.cxx
b/sd/source/core/undo/undofactory.cxx
index e00f2f2f94e0..b289853e11f7 100644
--- a/sd/source/core/undo/undofactory.cxx
+++ b/sd/source/core/undo/undofactory.cxx
@@ -22,9 +22,9 @@
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 )
diff --git a/sd/source/core/undo/undoobjects.cxx
b/sd/source/core/undo/undoobjects.cxx
index 4437e4005cb6..10bd0cdf6a92 100644
--- a/sd/source/core/undo/undoobjects.cxx
+++ b/sd/source/core/undo/undoobjects.cxx
@@ -91,8 +91,8 @@ void UndoRemovePresObjectImpl::Redo()
mpUndoUsercall->Redo();
}
-UndoRemoveObject::UndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect )
-: SdrUndoRemoveObj( rObject, bOrdNumDirect ), UndoRemovePresObjectImpl(
rObject )
+UndoRemoveObject::UndoRemoveObject( SdrObject& rObject )
+: SdrUndoRemoveObj( rObject ), UndoRemovePresObjectImpl( rObject )
, mxSdrObject(&rObject)
{
}
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 62b44d810e9a..61b829b95249 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -1699,9 +1699,9 @@ std::unique_ptr<SdrUndoAction>
SdrUndoFactory::CreateUndoAttrObject( SdrObject&
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 )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
