r21152 by fschmid -

[scribus-commit]

Author: fschmid
Date: Fri Apr  1 19:10:30 2016
New Revision: 21152

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21152
Log:
Revert accidently committed parts of last committ.

Modified:
    trunk/Scribus/scribus/plugins/export/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/ai/importai.cpp

Modified: trunk/Scribus/scribus/plugins/export/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21152&path=/trunk/Scribus/scribus/plugins/export/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/export/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/export/CMakeLists.txt	Fri Apr  1 19:10:30 2016
@@ -1,4 +1,3 @@
 ADD_SUBDIRECTORY(pixmapexport)
 ADD_SUBDIRECTORY(svgexplugin)
-ADD_SUBDIRECTORY(textexport)
 ADD_SUBDIRECTORY(xpsexport)

Modified: trunk/Scribus/scribus/plugins/import/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21152&path=/trunk/Scribus/scribus/plugins/import/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/CMakeLists.txt	Fri Apr  1 19:10:30 2016
@@ -1,7 +1,6 @@
 ADD_SUBDIRECTORY(ai)
 ADD_SUBDIRECTORY(cdr)
 ADD_SUBDIRECTORY(cgm)
-ADD_SUBDIRECTORY(cenon)
 ADD_SUBDIRECTORY(cvg)
 ADD_SUBDIRECTORY(drw)
 ADD_SUBDIRECTORY(emf)

Modified: trunk/Scribus/scribus/plugins/import/ai/importai.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21152&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	Fri Apr  1 19:10:30 2016
@@ -2776,7 +2776,7 @@
 							}
 							m_Doc->addPattern(currentPatternDefName, pat);
 							importedPatterns.append(currentPatternDefName);
-						/*	double minx =  std::numeric_limits<double>::max();
+							double minx =  std::numeric_limits<double>::max();
 							double miny =  std::numeric_limits<double>::max();
 							double maxx = -std::numeric_limits<double>::max();
 							double maxy = -std::numeric_limits<double>::max();
@@ -2790,7 +2790,7 @@
 							currItem->gYpos = currItem->yPos() - miny;
 							currItem->setXYPos(currItem->gXpos, currItem->gYpos, true);
 							m_Doc->docPatterns[currentPatternDefName].width = maxx - minx;
-							m_Doc->docPatterns[currentPatternDefName].height = maxy - miny;*/
+							m_Doc->docPatterns[currentPatternDefName].height = maxy - miny;
 						}
 					}
 					m_Doc->itemSelection_DeleteItem(tmpSel);