Author: jghali
Date: Sat Mar 30 00:38:57 2019
New Revision: 22920
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22920
Log:
fix a bool/int mix + some cosmetic changes
Modified:
trunk/Scribus/scribus/pageitem.cpp
Modified: trunk/Scribus/scribus/pageitem.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22920&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Sat Mar 30 00:38:57 2019
@@ -7348,21 +7348,21 @@
if (isUndo)
{
- this->ClipEdited=is->getBool("PATH_OP_OLD_CLIPEDITED");
- this->FrameType=is->getInt("PATH_OP_OLD_FRAMETYPE");
- this->OldB2=is->getDouble("PATH_OP_OLD_OLDB2");
- this->OldH2=is->getDouble("PATH_OP_OLD_OLDH2");
- QPair<FPointArray, FPointArray> oldLines=is->getItem().first;
+ this->ClipEdited = is->getBool("PATH_OP_OLD_CLIPEDITED");
+ this->FrameType = is->getInt("PATH_OP_OLD_FRAMETYPE");
+ this->OldB2 = is->getDouble("PATH_OP_OLD_OLDB2");
+ this->OldH2 = is->getDouble("PATH_OP_OLD_OLDH2");
+ QPair<FPointArray, FPointArray> oldLines = is->getItem().first;
this->PoLine = oldLines.first;
this->ContourLine = oldLines.second;
}
else
{
- this->ClipEdited=is->getBool("PATH_OP_NEW_CLIPEDITED");
- this->FrameType=is->getInt("PATH_OP_NEW_FRAMETYPE");
- this->OldB2=is->getDouble("PATH_OP_NEW_OLDB2");
- this->OldH2=is->getDouble("PATH_OP_NEW_OLDH2");
- QPair<FPointArray, FPointArray> newLines=is->getItem().second;
+ this->ClipEdited = is->getBool("PATH_OP_NEW_CLIPEDITED");
+ this->FrameType = is->getInt("PATH_OP_NEW_FRAMETYPE");
+ this->OldB2 = is->getDouble("PATH_OP_NEW_OLDB2");
+ this->OldH2 = is->getDouble("PATH_OP_NEW_OLDH2");
+ QPair<FPointArray, FPointArray> newLines = is->getItem().second;
this->PoLine = newLines.first;
this->ContourLine = newLines.second;
}
@@ -7416,7 +7416,7 @@
Segments.clear();
FrameType = is->getInt("FRAMETYPE");
ClipEdited = is->getBool("CLIPEDITED");
- bool oldRotMode = doc()->rotationMode();
+ int oldRotMode = doc()->rotationMode();
doc()->setRotationMode(0);
doc()->adjustItemSize(this);
doc()->setRotationMode(oldRotMode);
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
