r19847 by craig - #12925 Fix OSG compilation

[scribus-commit]

Author: craig
Date: Fri Feb 20 09:15:49 2015
New Revision: 19847

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19847
Log:
#12925 Fix OSG compilation

Modified:
    trunk/Scribus/scribus/pageitem_osgframe.cpp
    trunk/Scribus/scribus/ui/scrspinbox.cpp

Modified: trunk/Scribus/scribus/pageitem_osgframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19847&path=/trunk/Scribus/scribus/pageitem_osgframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_osgframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_osgframe.cpp Fri Feb 20 09:15:49 2015
@@ -101,7 +101,7 @@
 void PageItem_OSGFrame::setImage(QImage &image)
 {
 	isInlineImage = true;
-	if (PictureIsAvailable)
+	if (imageIsAvailable)
 	{
 		image.save(Pfile, "PNG");
 		m_Doc->loadPict(Pfile, this, true);
@@ -149,7 +149,7 @@
 {
 	actionList << "itemImageIsVisible";
 	actionList << "editEditRenderSource";
-	if (PictureIsAvailable)
+	if (imageIsAvailable)
 	{
 		actionList << "editClearContents";
 	}

Modified: trunk/Scribus/scribus/ui/scrspinbox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19847&path=/trunk/Scribus/scribus/ui/scrspinbox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scrspinbox.cpp (original)
+++ trunk/Scribus/scribus/ui/scrspinbox.cpp Fri Feb 20 09:15:49 2015
@@ -216,7 +216,7 @@
 		ts.replace(CommonStrings::trStrCM, CommonStrings::strCM);
 	if (CommonStrings::trStrC.localeAwareCompare(CommonStrings::strC)!=0)
 		ts.replace(CommonStrings::trStrC, CommonStrings::strC);
-/* not needed with fparser 4.5.1 and AddUnit
+/* not needed with fparser 3.3.2 and AddUnit
 	//Replace in our typed text all of the units strings with *unitstring
 	QRegExp rx("\\b(\\d+)\\s*("+CommonStrings::strPT+"|"+CommonStrings::strMM+"|"+CommonStrings::strC+"|"+CommonStrings::strCM+"|"+CommonStrings::strIN+")\\b");
 	pos = 0;