Author: jghali
Date: Sat Dec 2 13:53:35 2017
New Revision: 22230
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22230
Log:
reduce direct access to PageItem OwnPage/LayerID/OnMasterPage members
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22230&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
Sat Dec 2 13:53:35 2017
@@ -524,7 +524,7 @@
currItem->ColGap = Buffer->ColGap;
currItem->setFirstLineOffset(Buffer->firstLineOffsetP);
if (Buffer->LayerID != -1)
- currItem->LayerID = Buffer->LayerID;
+ currItem->setLayer(Buffer->LayerID);
currItem->PoLine = Buffer->PoLine.copy();
currItem->setTextFlowMode((PageItem::TextFlowMode)
Buffer->TextflowMode);
if (Buffer->ContourLine.size() == 0)
@@ -682,7 +682,7 @@
currItem->setObjectAttributes(&(Buffer->pageItemAttributes));
if (resize)
m_Doc->setRedrawBounding(currItem);
- currItem->OwnPage = m_Doc->OnPage(currItem);
+ currItem->setOwnerPage(m_Doc->OnPage(currItem));
// undoManager->setUndoEnabled(true);
}
@@ -1083,8 +1083,8 @@
PasteItem(&OB);
/*m_Doc->GroupCounter = docGc;*/
Neu = m_Doc->Items->at(last);
- Neu->OnMasterPage = PgNam;
- Neu->OwnPage = a; //No need to scan for
OnPage as we know page by page in 1.2.x
+ Neu->setMasterPageName(PgNam);
+ Neu->setOwnerPage(a); //No need to scan
for OnPage as we know page by page in 1.2.x
Neu->oldOwnPage = 0;
Neu->setRedrawBounding();
IT=OBJ.firstChild();
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
