Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flank more carefully change marking actions, return the result from convert_to_utf8

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4164 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shatty 2003-07-31 09:08:21 +00:00
parent fb2e95f496
commit 0b6b71e99a
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/apps/stylededit/StyledEditView.cpp
View File

@ -58,15 +58,18 @@ StyledEditView::FrameResized(float width, float height)
*/ */
} }
#include <stdio.h>
status_t status_t
StyledEditView::GetStyledText(BPositionIO * stream) StyledEditView::GetStyledText(BPositionIO * stream)
{ {
status_t result = B_OK; status_t result = B_OK;
fSuppressChanges = true;
fSuppressChanges = true;
result = BTranslationUtils::GetStyledText(stream, this, NULL); result = BTranslationUtils::GetStyledText(stream, this, NULL);
fSuppressChanges = false;
if (result != B_OK) { if (result != B_OK) {
fSuppressChanges = false;
return result; return result;
} }
@ -113,7 +116,9 @@ StyledEditView::GetStyledText(BPositionIO * stream)
int32 length = stream->Seek(0,SEEK_END); int32 length = stream->Seek(0,SEEK_END);
text_run_array * run_array = RunArray(0,length); text_run_array * run_array = RunArray(0,length);
uint32 id = BCharacterSetRoster::GetCharacterSetByFontID(fEncoding)->GetConversionID(); uint32 id = BCharacterSetRoster::GetCharacterSetByFontID(fEncoding)->GetConversionID();
fSuppressChanges = true;
SetText(""); SetText("");
fSuppressChanges = false;
char inBuffer[256]; char inBuffer[256];
off_t location = 0; off_t location = 0;
int32 textOffset = 0; int32 textOffset = 0;
@ -125,8 +130,13 @@ StyledEditView::GetStyledText(BPositionIO * stream)
int32 textLength = 256; int32 textLength = 256;
int32 bytes = bytesRead; int32 bytes = bytesRead;
while (textLength > 0) { while (textLength > 0) {
convert_to_utf8(id,inPtr,&bytes,textBuffer,&textLength,&state); result = convert_to_utf8(id,inPtr,&bytes,textBuffer,&textLength,&state);
if (result != B_OK) {
return result;
}
fSuppressChanges = true;
InsertText(textBuffer,textLength,textOffset); InsertText(textBuffer,textLength,textOffset);
fSuppressChanges = false;
textOffset += textLength; textOffset += textLength;
inPtr += bytes; inPtr += bytes;
location += bytes; location += bytes;
@ -139,7 +149,6 @@ StyledEditView::GetStyledText(BPositionIO * stream)
} }
SetRunArray(0,length,run_array); SetRunArray(0,length,run_array);
} }
fSuppressChanges = false;
return result; return result;
} }