From 5b14ba1a07feab7227a35a5013fbde4fe683eb78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Sat, 11 Mar 2006 12:48:38 +0000
Subject: [PATCH] * Now uses BTextView::FreeTextRunArray() instead of just
 free() where appropriate. * When reading/writing int32, the type of the
 variable should match.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16699 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/stylededit/StyledEditView.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/apps/stylededit/StyledEditView.cpp b/src/apps/stylededit/StyledEditView.cpp
index 6a4b45cdaa..0971c54696 100644
--- a/src/apps/stylededit/StyledEditView.cpp
+++ b/src/apps/stylededit/StyledEditView.cpp
@@ -93,6 +93,7 @@ StyledEditView::GetStyledText(BPositionIO* stream)
 		bytesRead = node->ReadAttr("be:encoding", 0, 0, &encoding, sizeof(encoding));
 		if (bytesRead == (ssize_t)sizeof(encoding)) {
 			if (encoding == 65535) {
+				// UTF-8
 				fEncoding = 0;
 			} else {
 				const BCharacterSet* characterSet
@@ -103,10 +104,10 @@ StyledEditView::GetStyledText(BPositionIO* stream)
 		}
 
 		// restore alignment
-		alignment align;
+		int32 align;
 		bytesRead = node->ReadAttr("alignment", 0, 0, &align, sizeof(align));
 		if (bytesRead == (ssize_t)sizeof(align))
-			SetAlignment(align);
+			SetAlignment((alignment)align);
 
 		// restore wrapping
 		bool wrap;
@@ -166,7 +167,7 @@ StyledEditView::GetStyledText(BPositionIO* stream)
 
 		// ... and here we restore it
 		SetRunArray(0, length, runArray);
-		free(runArray);
+		FreeRunArray(runArray);
 	}
 
 	return result;
@@ -222,7 +223,7 @@ StyledEditView::WriteStyledEditFile(BFile* file)
 		}
 	}
 
-	alignment align = Alignment();
+	int32 align = Alignment();
 	bytes = file->WriteAttr("alignment", B_INT32_TYPE, 0, &align, sizeof(align));
 	if (bytes < 0)
 		return bytes;