kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

App: fix dynamic property undo/redo

Browse Source 
Instead of enforce property type match when undo/redo, modify various
property Paste() to make it type safe.
This commit is contained in:
Zheng, Lei
2019-09-30 14:18:40 +08:00
committed by wmayer
parent cc94eb9966
commit f6ad70195f
6 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Spreadsheet/App/PropertyColumnWidths.cpp
View File

@@ -63,7 +63,7 @@ App::Property *PropertyColumnWidths::Copy() const
void PropertyColumnWidths::Paste(const App::Property &from)
{
setValues(static_cast<const PropertyColumnWidths&>(from).getValues());
setValues(dynamic_cast<const PropertyColumnWidths&>(from).getValues());
}
void PropertyColumnWidths::setValues(const std::map<int,int> &values) {

2
src/Mod/Spreadsheet/App/PropertyRowHeights.cpp
View File

@@ -56,7 +56,7 @@ App::Property *PropertyRowHeights::Copy() const
void PropertyRowHeights::Paste(const Property &from)
{
setValues(static_cast<const PropertyRowHeights&>(from).getValues());
setValues(dynamic_cast<const PropertyRowHeights&>(from).getValues());
}
void PropertyRowHeights::setValues(const std::map<int,int> &values) {

10
src/Mod/Spreadsheet/App/PropertySheet.cpp
View File

@@ -224,9 +224,9 @@ App::Property *PropertySheet::Copy(void) const
void PropertySheet::Paste(const Property &from)
{
AtomicPropertyChange signaller(*this);
const PropertySheet &froms = dynamic_cast<const PropertySheet&>(from);
const PropertySheet * froms = static_cast<const PropertySheet*>(&from);
AtomicPropertyChange signaller(*this);
std::map<CellAddress, Cell* >::iterator icurr = data.begin();
@@ -236,8 +236,8 @@ void PropertySheet::Paste(const Property &from)
++icurr;
}
std::map<CellAddress, Cell* >::const_iterator ifrom = froms->data.begin();
while (ifrom != froms->data.end()) {
std::map<CellAddress, Cell* >::const_iterator ifrom = froms.data.begin();
while (ifrom != froms.data.end()) {
std::map<CellAddress, Cell* >::iterator i = data.find(ifrom->first);
if (i != data.end()) {
@@ -269,7 +269,7 @@ void PropertySheet::Paste(const Property &from)
++icurr;
}
mergedCells = froms->mergedCells;
mergedCells = froms.mergedCells;
signaller.tryInvoke();
}

5
src/Mod/Spreadsheet/App/Sheet.cpp
View File

@@ -1470,9 +1470,10 @@ Property *PropertySpreadsheetQuantity::Copy() const
void PropertySpreadsheetQuantity::Paste(const Property &from)
{
const auto &src = dynamic_cast<const PropertySpreadsheetQuantity&>(from);
aboutToSetValue();
_dValue = static_cast<const PropertySpreadsheetQuantity*>(&from)->_dValue;
_Unit = static_cast<const PropertySpreadsheetQuantity*>(&from)->_Unit;
_dValue = src._dValue;
_Unit = src._Unit;
hasSetValue();
}