[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1597
Date       : Sat Jul 29 14:31:27 BST 2006

Changed paths:
   M /Trunk/XaraLX/tools/textinfo.cpp

Silence build warnings


Diff:
Index: Trunk/XaraLX/tools/textinfo.cpp
===================================================================
--- Trunk/XaraLX/tools/textinfo.cpp	(revision 1596)
+++ Trunk/XaraLX/tools/textinfo.cpp	(revision 1597)
@@ -3111,7 +3111,7 @@
 		MILLIPOINT LastPos = 0;
 		for (TxtTabStopIterator it = RulerData.pShownRuler->begin(); it != RulerData.pShownRuler->end(); ++it)
 		{
-			ResourceID id;
+			ResourceID id=0;
 			switch((*it).GetType())
 			{
 				case LeftTab:
@@ -3159,12 +3159,9 @@
 	FIXED16 PixelSize = pDocView->GetScaledPixelWidth();
 	MILLIPOINT Pos = CurrentTabButtonPos*PixelSize.MakeLong();
 
-	ResourceID id;
+	ResourceID id=0;
 	switch(RulerData.CurrentTabType)
 	{
-		case LeftTab:
-			id = _R(clefttab);
-			break;
 		case RightTab:
 			id = _R(crighttab);
 			break;
@@ -3174,6 +3171,9 @@
 		case DecimalTab:
 			id = _R(cdectab);
 			break;
+		case LeftTab:
+			id = _R(clefttab);
+			break;
 	}
 	pRuler->DrawBitmap(Pos, id);
 }
@@ -3620,7 +3620,8 @@
 
 	// first of all, check whether we want to change the ruler origin
 	BOOL ShouldWeClaimRuler = FALSE;
-	INT32 RulerOrigin, StoryWidth;
+	INT32 RulerOrigin=0;
+	INT32 StoryWidth=0;
 	TextStory* pFocusStory = TextStory::GetFocusStory();
 	if (pFocusStory)
 	{


Xara