r16325 by jghali - merge trunk revisions up to r16317 - missing variable initialization + inconsistent line ending fix

[scribus-commit]

Author: jghali
Date: Sun Jan 30 15:24:30 2011
New Revision: 16325

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16325
Log:
merge trunk revisions up to r16317 - missing variable initialization + inconsistent line ending fix

Modified:
    branches/ScribusOIF/scribus/canvasmode_editspiral.cpp
    branches/ScribusOIF/scribus/canvasmode_editspiral.h

Modified: branches/ScribusOIF/scribus/canvasmode_editspiral.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16325&path=/branches/ScribusOIF/scribus/canvasmode_editspiral.cpp
==============================================================================
--- branches/ScribusOIF/scribus/canvasmode_editspiral.cpp (original)
+++ branches/ScribusOIF/scribus/canvasmode_editspiral.cpp Sun Jan 30 15:24:30 2011
@@ -47,6 +47,7 @@
 CanvasMode_EditSpiral::CanvasMode_EditSpiral(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW) 
 {
 	Mxp = Myp = -1;
+	m_blockUpdateFromItem = 0;
 	m_arcPoint = noPointDefined;
 }
 

Modified: branches/ScribusOIF/scribus/canvasmode_editspiral.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16325&path=/branches/ScribusOIF/scribus/canvasmode_editspiral.h
==============================================================================
--- branches/ScribusOIF/scribus/canvasmode_editspiral.h (original)
+++ branches/ScribusOIF/scribus/canvasmode_editspiral.h Sun Jan 30 15:24:30 2011
@@ -79,8 +79,8 @@
 	eSpiralPoint m_arcPoint;
 	SpiralVectorDialog* VectorDialog;
 
-	int    m_blockUpdateFromItem;
-	void   blockUpdateFromItem(bool block) { if (block) ++m_blockUpdateFromItem; else --m_blockUpdateFromItem; }
+	int    m_blockUpdateFromItem;
+	void   blockUpdateFromItem(bool block) { if (block) ++m_blockUpdateFromItem; else --m_blockUpdateFromItem; }
 	bool   updateFromItemBlocked() { return (m_blockUpdateFromItem > 0); }
 
 public slots: