r14567 by cbradney - #8714: Add in Solaris locale.h include. Remove unneeded var causing warnings

[scribus-commit]

Revision: 14567
Author: cbradney
Date: 2010-01-23T20:16:33.058319Z
Commit message: #8714: Add in Solaris locale.h include. Remove unneeded var causing warnings

Changeset: 
M  /branches/Version135/Scribus/scribus/scclocale.h
M  /branches/Version135/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp

Diffs:
Index: scribus/scclocale.h
===================================================================
--- scribus/scclocale.h	(revision 14566)
+++ scribus/scclocale.h	(revision 14567)
@@ -21,6 +21,10 @@
 #include <xlocale.h>
 #endif
 
+#if defined(Q_OS_SOLARIS)
+#include <locale.h>
+#endif
+
 #if defined(Q_WS_WIN)
 #define XLocaleType _locale_t
 #else
Index: scribus/plugins/fileloader/scribus13format/scribus13format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 14566)
+++ scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 14567)
@@ -883,7 +883,8 @@
 					//m_Doc->Pages = &m_Doc->MasterPages;
 					m_Doc->setMasterPageMode(true);
 				}
-				int docGc = m_Doc->GroupCounter, pagenr = -1;
+				//int docGc = m_Doc->GroupCounter, 
+				int pagenr = -1;
 				if ((!pg.attribute("OnMasterPage").isEmpty()) && (pg.tagName()=="MASTEROBJECT"))
 				{
 					m_Doc->setCurrentPage(m_Doc->MasterPages.at(m_Doc->MasterNames[pg.attribute("OnMasterPage")]));