r19447 by fschmid - First version of a PageMaker importer based on libpagemaker.

[scribus-commit]

Author: fschmid
Date: Sun Aug 24 15:59:23 2014
New Revision: 19447

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19447
Log:
First version of a PageMaker importer based on libpagemaker.

Added:
    trunk/Scribus/scribus/plugins/import/pm/
    trunk/Scribus/scribus/plugins/import/pm/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/pm/importpm.cpp
    trunk/Scribus/scribus/plugins/import/pm/importpm.h
    trunk/Scribus/scribus/plugins/import/pm/importpmplugin.cpp
    trunk/Scribus/scribus/plugins/import/pm/importpmplugin.h
Modified:
    trunk/Scribus/scribus/plugins/import/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp

Modified: trunk/Scribus/scribus/plugins/import/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19447&path=/trunk/Scribus/scribus/plugins/import/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/CMakeLists.txt Sun Aug 24 15:59:23 2014
@@ -16,7 +16,7 @@
 ENDIF(HAVE_POPPLER)
 # ADD_SUBDIRECTORY(pgs)
 # ADD_SUBDIRECTORY(ppp)
-# ADD_SUBDIRECTORY(pm)
+ADD_SUBDIRECTORY(pm)
 ADD_SUBDIRECTORY(pub)
 ADD_SUBDIRECTORY(shape)
 ADD_SUBDIRECTORY(sml)

Modified: trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19447&path=/trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp Sun Aug 24 15:59:23 2014
@@ -476,6 +476,7 @@
 		return;
 	if (propList["svg:x"] && propList["svg:y"] && propList["svg:width"] && propList["svg:height"])
 	{
+		setStyle(propList);
 		double x = valueAsPoint(propList["svg:x"]);
 		double y = valueAsPoint(propList["svg:y"]);
 		double w = valueAsPoint(propList["svg:width"]);
@@ -495,6 +496,7 @@
 		return;
 	if (propList["svg:x"] && propList["svg:y"] && propList["svg:width"] && propList["svg:height"])
 	{
+		setStyle(propList);
 		double x = valueAsPoint(propList["svg:x"]);
 		double y = valueAsPoint(propList["svg:y"]);
 		double w = valueAsPoint(propList["svg:width"]);
@@ -515,6 +517,7 @@
 	librevenge::RVNGPropertyListVector vertices = *propList.child("svg:points");
 	if(vertices.count() < 2)
 		return;
+	setStyle(propList);
 	Coords.resize(0);
 	Coords.svgInit();
 	PageItem *ite;
@@ -540,6 +543,7 @@
 	librevenge::RVNGPropertyListVector vertices = *propList.child("svg:points");
 	if(vertices.count() < 2)
 		return;
+	setStyle(propList);
 	Coords.resize(0);
 	Coords.svgInit();
 	PageItem *ite;
@@ -669,6 +673,7 @@
 {
 	if (!doProcessing)
 		return;
+	setStyle(propList);
 	librevenge::RVNGPropertyListVector path = *propList.child("svg:d");
 	bool isClosed = false;
 	QString svgString = "";
@@ -827,6 +832,7 @@
 		return;
 	if (!propList["office:binary-data"])
 		return;
+	setStyle(propList);
 	if (propList["svg:x"] && propList["svg:y"] && propList["svg:width"] && propList["svg:height"])
 	{
 		PageItem *ite;
@@ -945,6 +951,7 @@
 	actTextItem = NULL;
 	lineSpSet = false;
 	lineSpIsPT = false;
+	setStyle(propList);
 	if (propList["svg:x"] && propList["svg:y"] && propList["svg:width"] && propList["svg:height"])
 	{
 		double x = valueAsPoint(propList["svg:x"]);
@@ -2838,7 +2845,7 @@
 		return ScCLocale::toDoubleC(s1) / 100.0;
 	}
 	else
-		return ScCLocale::toDoubleC(s1);
+		return ScCLocale::toDoubleC(s1) / 100.0;
 }
 
 QColor RawPainter::parseColorN( const QString &rgbColor )