Author: jghali
Date: Fri Jul 17 15:57:18 2020
New Revision: 23927
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23927
Log:
Remove unused member from ScribusDoc
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
trunk/Scribus/scribus/scribusdoc.h
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23927&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
==============================================================================
---
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
(original)
+++
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
Fri Jul 17 15:57:18 2020
@@ -1028,11 +1028,9 @@
}
GetItemProps(&obj, &OB, fileDir,
newVersion);
OB.Xpos =
ScCLocale::toDoubleC(obj.attribute("XPOS"))+m_Doc->Pages->at(a)->xOffset();
-
OB.Ypos=ScCLocale::toDoubleC(obj.attribute("YPOS"))+m_Doc->Pages->at(a)->yOffset();
+ OB.Ypos =
ScCLocale::toDoubleC(obj.attribute("YPOS"))+m_Doc->Pages->at(a)->yOffset();
OB.NamedLStyle =
obj.attribute("NAMEDLST", "");
-
OB.isBookmark=obj.attribute("BOOKMARK").toInt();
- if ((OB.isBookmark) &&
(m_Doc->BookMarks.count() == 0))
- m_Doc->OldBM = true;
+ OB.isBookmark =
obj.attribute("BOOKMARK").toInt();
OB.textAlignment =
obj.attribute("ALIGN", "0").toInt();
OB.startArrowIndex = 0;
OB.endArrowIndex = 0;
@@ -2030,9 +2028,7 @@
OB.endArrowIndex = 0;
OB.startArrowScale = 100;
OB.endArrowScale = 100;
-
OB.isBookmark=obj.attribute("BOOKMARK").toInt();
- if ((OB.isBookmark) &&
(m_Doc->BookMarks.count() == 0))
- m_Doc->OldBM = true;
+ OB.isBookmark =
obj.attribute("BOOKMARK").toInt();
OB.textAlignment =
obj.attribute("ALIGN", "0").toInt();
tmpf = obj.attribute("IFONT",
m_Doc->itemToolPrefs().textFont);
if (tmpf.isEmpty())
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23927&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
---
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
(original)
+++
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
Fri Jul 17 15:57:18 2020
@@ -2745,8 +2745,6 @@
currItem->setEndArrowScale(attrs.valueAsInt("endArrowScale", 100));
currItem->NamedLStyle = attrs.valueAsString("NAMEDLST", "");
currItem->isBookmark = attrs.valueAsInt("BOOKMARK");
- if ((currItem->isBookmark) && (doc->BookMarks.count() == 0))
- doc->OldBM = true;
currItem->setImageFlippedH( attrs.valueAsInt("FLIPPEDH"));
currItem->setImageFlippedV( attrs.valueAsInt("FLIPPEDV"));
currItem->setCornerRadius( attrs.valueAsDouble("RADRECT", 0.0));
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23927&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
==============================================================================
---
trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
(original)
+++
trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
Fri Jul 17 15:57:18 2020
@@ -1658,8 +1658,6 @@
currItem->setEndArrowScale(obj->attribute("endArrowScale",
"100").toInt());
currItem->NamedLStyle = obj->attribute("NAMEDLST", "");
currItem->isBookmark = obj->attribute("BOOKMARK").toInt();
- if ((currItem->isBookmark) && (doc->BookMarks.count() == 0))
- doc->OldBM = true;
currItem->setImageFlippedH(obj->attribute("FLIPPEDH").toInt());
currItem->setImageFlippedV(obj->attribute("FLIPPEDV").toInt());
currItem->setCornerRadius(ScCLocale::toDoubleC(obj->attribute("RADRECT"), 0.0));
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23927&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
---
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
(original)
+++
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
Fri Jul 17 15:57:18 2020
@@ -5185,8 +5185,6 @@
currItem->setEndArrowScale(attrs.valueAsInt("endArrowScale", 100));
currItem->NamedLStyle = attrs.valueAsString("NAMEDLST", "");
currItem->isBookmark = attrs.valueAsInt("BOOKMARK", 0);
- if ((currItem->isBookmark) && (doc->BookMarks.count() == 0))
- doc->OldBM = true;
currItem->setImageFlippedH( attrs.valueAsInt("FLIPPEDH", 0));
currItem->setImageFlippedV( attrs.valueAsInt("FLIPPEDV", 0));
currItem->setCornerRadius( attrs.valueAsDouble("RADRECT", 0.0));
Modified: trunk/Scribus/scribus/scribusdoc.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23927&path=/trunk/Scribus/scribus/scribusdoc.h
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.h (original)
+++ trunk/Scribus/scribus/scribusdoc.h Fri Jul 17 15:57:18 2020
@@ -1413,7 +1413,6 @@
bool operator<(const BookMa& other) const { return ItemNr <
other.ItemNr; }
};
QList<BookMa> BookMarks;
- bool OldBM {false};
bool hasName {false};
bool isConverted {false};
QTimer * const autoSaveTimer;
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
