r16645 by jghali - #10036: placeEPS() will move already selected objects
scribus-commit
scribus-commit at lists.scribus.net
Thu Jun 9 11:43:05 UTC 2011
Author: jghali
Date: Thu Jun 9 11:43:05 2011
New Revision: 16645
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16645
Log:
#10036: placeEPS() will move already selected objects
Modified:
trunk/Scribus/scribus/plugins/import/ai/importai.cpp
trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
Modified: trunk/Scribus/scribus/plugins/import/ai/importai.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16645&path=/trunk/Scribus/scribus/plugins/import/ai/importai.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importai.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/ai/importai.cpp Thu Jun 9 11:43:05 2011
@@ -424,6 +424,8 @@
importedColors.append(it.key());
}
}
+ if (!(flags & LoadSavePlugin::lfLoadAsPattern))
+ m_Doc->view()->Deselect();
Elements.clear();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
Modified: trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16645&path=/trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp Thu Jun 9 11:43:05 2011
@@ -210,6 +210,8 @@
m_Doc->setPageOrientation(0);
m_Doc->setPageSize("Custom");
}
+ if (!(flags & LoadSavePlugin::lfLoadAsPattern))
+ m_Doc->view()->Deselect();
Elements.clear();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
Modified: trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16645&path=/trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp Thu Jun 9 11:43:05 2011
@@ -224,6 +224,8 @@
m_Doc->setPageOrientation(0);
m_Doc->setPageSize("Custom");
}
+ if (!(flags & LoadSavePlugin::lfLoadAsPattern))
+ m_Doc->view()->Deselect();
Elements.clear();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
Modified: trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16645&path=/trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pct/importpct.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pct/importpct.cpp Thu Jun 9 11:43:05 2011
@@ -210,6 +210,8 @@
m_Doc->setPageOrientation(0);
m_Doc->setPageSize("Custom");
}
+ if (!(flags & LoadSavePlugin::lfLoadAsPattern))
+ m_Doc->view()->Deselect();
Elements.clear();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
Modified: trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16645&path=/trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/shape/importshape.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/shape/importshape.cpp Thu Jun 9 11:43:05 2011
@@ -210,6 +210,8 @@
m_Doc->setPageOrientation(0);
m_Doc->setPageSize("Custom");
}
+ if (!(flags & LoadSavePlugin::lfLoadAsPattern))
+ m_Doc->view()->Deselect();
Elements.clear();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
Modified: trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16645&path=/trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/sml/importsml.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/sml/importsml.cpp Thu Jun 9 11:43:05 2011
@@ -208,6 +208,8 @@
m_Doc->setPageOrientation(0);
m_Doc->setPageSize("Custom");
}
+ if (!(flags & LoadSavePlugin::lfLoadAsPattern))
+ m_Doc->view()->Deselect();
Elements.clear();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16645&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp Thu Jun 9 11:43:05 2011
@@ -594,7 +594,8 @@
m_Doc->setPageOrientation(0);
m_Doc->setPageSize("Custom");
}
- m_Doc->view()->Deselect();
+ if (!(flags & LoadSavePlugin::lfLoadAsPattern))
+ m_Doc->view()->Deselect();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
if (!(flags & LoadSavePlugin::lfLoadAsPattern))
Modified: trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16645&path=/trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp Thu Jun 9 11:43:05 2011
@@ -570,6 +570,8 @@
m_Doc->setPageOrientation(0);
m_Doc->setPageSize("Custom");
}
+ if (!(flags & LoadSavePlugin::lfLoadAsPattern))
+ m_Doc->view()->Deselect();
Elements.clear();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
Modified: trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16645&path=/trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xar/importxar.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/xar/importxar.cpp Thu Jun 9 11:43:05 2011
@@ -315,6 +315,8 @@
m_Doc->setPageOrientation(0);
m_Doc->setPageSize("Custom");
}
+ if (!(flags & LoadSavePlugin::lfLoadAsPattern))
+ m_Doc->view()->Deselect();
Elements.clear();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
Modified: trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16645&path=/trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp Thu Jun 9 11:43:05 2011
@@ -345,6 +345,8 @@
m_Doc->setPageOrientation(0);
m_Doc->setPageSize("Custom");
}
+ if (!(flags & LoadSavePlugin::lfLoadAsPattern))
+ m_Doc->view()->Deselect();
Elements.clear();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
More information about the scribus-commit
mailing list