r22529 by jghali - #15308: the preview mode state should not be stored in the .sla

[scribus-commit]

Author: jghali
Date: Wed May  9 09:16:52 2018
New Revision: 22529

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22529
Log:
#15308: the preview mode state should not be stored in the .sla

Modified:
    
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp

Modified: 
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22529&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  
    Wed May  9 09:16:52 2018
@@ -2166,7 +2166,7 @@
        doc->guidesPrefs().rulerMode    = attrs.valueAsBool("rulerMode", true);
        doc->guidesPrefs().rulersShown  = attrs.valueAsBool("showrulers", true);
        doc->guidesPrefs().showBleed    = attrs.valueAsBool("showBleed", true);
-       m_Doc->drawAsPreview                = attrs.valueAsBool("previewMode", 
false);
+       m_Doc->drawAsPreview                = false 
/*attrs.valueAsBool("previewMode", false)*/;
        if (attrs.hasAttribute("MARGC"))
                doc->guidesPrefs().marginColor  = 
QColor(attrs.valueAsString("MARGC"));
        if (attrs.hasAttribute("MINORC"))

Modified: 
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22529&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
==============================================================================
--- 
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
 (original)
+++ 
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
 Wed May  9 09:16:52 2018
@@ -302,7 +302,8 @@
        docu.writeAttribute("SHOWGRID", 
static_cast<int>(m_Doc->guidesPrefs().gridShown));
        docu.writeAttribute("SHOWGUIDES", 
static_cast<int>(m_Doc->guidesPrefs().guidesShown));
        docu.writeAttribute("showcolborders", 
static_cast<int>(m_Doc->guidesPrefs().colBordersShown));
-       docu.writeAttribute("previewMode", 
static_cast<int>(m_Doc->drawAsPreview));
+       // #15308: the preview mode state should not be stored in the .sla
+       // docu.writeAttribute("previewMode", 
static_cast<int>(m_Doc->drawAsPreview));
        if (m_Doc->drawAsPreview)
        {
                docu.writeAttribute("SHOWFRAME", 
static_cast<int>(m_View->storedFramesShown));


_______________________________________________
scribus-commit mailing list
scribus-commit@lists.scribus.net
http://lists.scribus.net/mailman/listinfo/scribus-commit