Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 23178 → Rev 23179

/trunk/Scribus/scribus/scribusdoc.cpp
207,12 → 207,12
m_undoManager(UndoManager::instance()),
m_automaticTextFrames(false),
m_guardedObject(this),
m_documentFileName( tr("Document") + "-"),
minCanvasCoordinate(FPoint(0, 0)),
m_Selection(new Selection(this, true)),
PageSp(1), PageSpa(0),
FirstPnum(1),
PageColors(this, true),
m_documentFileName( tr("Document")+"-"),
AllFonts(&m_appPrefsData.fontPrefs.AvailFonts),
colorEngine(ScCore->defaultEngine),
autoSaveTimer(new QTimer(this)),
246,12 → 246,12
m_docUnitRatio(unitGetRatioFromIndex(m_appPrefsData.docSetupPrefs.docUnitIndex)),
m_automaticTextFrames(pagesSetup.autoTextFrames),
m_guardedObject(this),
m_documentFileName(docName),
minCanvasCoordinate(FPoint(0, 0)),
m_Selection(new Selection(this, true)),
PageSp(pagesSetup.columnCount), PageSpa(pagesSetup.columnDistance),
FirstPnum(pagesSetup.firstPageNumber),
PageColors(this, true),
m_documentFileName(docName),
AllFonts(&m_appPrefsData.fontPrefs.AvailFonts),
colorEngine(ScCore->defaultEngine),
autoSaveTimer(new QTimer(this)),
/trunk/Scribus/scribus/scribusdoc.h
1860,7 → 1860,7
void ImportData();
void ResetFormFields();
QString documentFileName() const;
void setDocumentFileName(const QString& m_documentFileName);
void setDocumentFileName(const QString& documentFileName);
};
 
Q_DECLARE_METATYPE(ScribusDoc*);