From 6dc85dbf523ba9b59a81ccefe2994bffa214af1d Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Fri, 29 Oct 2004 09:18:35 +0000 Subject: [PATCH] Added a comment to some stuff which wasn't so clear (thanks to Andrew for clarifying this). Now we free() the run_array allocated by "RunArray()" (as we're supposed to do), thus removing a leak. Changed some includes from <> to "" just for my personal pleasure. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9648 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/stylededit/StyledEditView.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/apps/stylededit/StyledEditView.cpp b/src/apps/stylededit/StyledEditView.cpp index c68ec9a455..d5c83302ee 100644 --- a/src/apps/stylededit/StyledEditView.cpp +++ b/src/apps/stylededit/StyledEditView.cpp @@ -5,12 +5,13 @@ #include #include #include +#include #include #include #include -#include -#include +#include "StyledEditView.h" +#include "Constants.h" using namespace BPrivate; @@ -112,6 +113,8 @@ StyledEditView::GetStyledText(BPositionIO * stream) } if (fEncoding != 0) { int32 length = stream->Seek(0,SEEK_END); + + // Here we save the run_array before it gets overwritten... text_run_array * run_array = RunArray(0,length); uint32 id = BCharacterSetRoster::GetCharacterSetByFontID(fEncoding)->GetConversionID(); fSuppressChanges = true; @@ -145,7 +148,10 @@ StyledEditView::GetStyledText(BPositionIO * stream) } } } + + // ... and here we restore it SetRunArray(0,length,run_array); + free(run_array); } return result; }