From 38e4cf0e0be97bca28e9133fb91e47c9f74c807f Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Wed, 4 Feb 2015 19:55:55 +0000 Subject: [PATCH] fpspreadsheet: Fix utf8 conversion issue of BIFFExplorer git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3926 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../reference/BIFFExplorer/bemain.lfm | 116 ------------------ .../reference/BIFFExplorer/bemain.pas | 3 +- 2 files changed, 1 insertion(+), 118 deletions(-) diff --git a/components/fpspreadsheet/reference/BIFFExplorer/bemain.lfm b/components/fpspreadsheet/reference/BIFFExplorer/bemain.lfm index 752d006d3..551c7d192 100644 --- a/components/fpspreadsheet/reference/BIFFExplorer/bemain.lfm +++ b/components/fpspreadsheet/reference/BIFFExplorer/bemain.lfm @@ -105,14 +105,6 @@ object MainForm: TMainForm Align = alBottom ResizeAnchor = akBottom end - object StringGrid1: TStringGrid - Left = 66 - Height = 100 - Top = 43 - Width = 200 - Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goThumbTracking, goSmoothScroll, goSelectionActive] - TabOrder = 2 - end end object PgValues: TTabSheet Caption = 'Values' @@ -383,42 +375,6 @@ object MainForm: TMainForm Width = 23 Action = AcFindNext Flat = True - Glyph.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00E297 - 3A00D98E3300CB802900BC711D00AE631200A05509159B5005AE9B5005AEA055 - 0915AE631200BC711D00CB802900D98E3300E2973A00FFFFFF00FFFFFF00E297 - 3A00D98E3300CB802900BC711D00AE631215A75C0DAED38D19E6D38C18E6A75C - 0DAEAE631215BC711D00CB802900D98E3300E2973A00FFFFFF00FFFFFF00E297 - 3A00D98E3300CB802900BC711D15B56A18AED69737E6F1B436FFF0B130FFD492 - 2DE6B56A18AEBC711D15CB802900D98E3300E2973A00FFFFFF00FFFFFF00E297 - 3A00D98E3300CB802915C37923AEDCA553E6E3B25DFFD3953BFFD3953BFFDFA9 - 52FFD69A45E6C37923AECB802915D98E3300E2973A00FFFFFF00FFFFFF00E297 - 3A00D98E3315D2872EAEE8B563E6F7CB7FFFEAAF63FFE0A559FFD69B4FFFD195 - 49FFDDAC60FFDFA553E6D2872EAED98E3315E2973A00FFFFFF00FFFFFF00E297 - 3A15DF9438AEF0BD69E6FEDE92FFFCD68AFFFCD68AFFFCD68AFFFCD68AFFFCD5 - 89FFFCD589FFFDDA8EFFEFBA66E6DF9438AEE2973A15FFFFFF00FFFFFF00E69B - 3D33E89D3FCCE89D3FCCE89D3FCCE89D3FCCE89D3FCCE89D3FCCE89D3FCCE89D - 3FCCE89D3FCCE89D3FCCE89D3FCCE89D3FCCE69B3D33FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 - } end object BtnFindPrev: TSpeedButton Left = 216 @@ -427,42 +383,6 @@ object MainForm: TMainForm Width = 23 Action = AcFindPrev Flat = True - Glyph.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF009C51 - 06999B5005CC9B5005CC9B5005CC9B5005CC9B5005CC9B5005CC9B5005CC9B50 - 05CC9B5005CC9B5005CC9B5005CC9C510699FFFFFF00FFFFFF00FFFFFF00A55A - 0C5CA75C0DCCF9C966FFFAB827FFFBB71CFFFBB518FFFBB414FFFBB311FFFBB2 - 0FFFFBB20EFFFBB516FFA75C0DCCA55A0C5CFFFFFF00FFFFFF00FFFFFF00A75C - 0D00B368175CB56A18CCF8CF80FFE6A53EFFDE9D2FFFDD9C2EFFDD9C2EFFDD9C - 2EFFE6AE47FFB56A18CCB368175CA75C0D00FFFFFF00FFFFFF00FFFFFF00A75C - 0D00B56A1800C177225CC37923CCFBD98DFFECB367FFE1A75BFFD79C50FFE7BC - 70FFC37923CCC177225CB56A1800A75C0D00FFFFFF00FFFFFF00FFFFFF00A75C - 0D00B56A1800C3792300D0852D5CD2872ECCFEE195FFF8C77BFFFDDE92FFD287 - 2ECCD0852D5CC3792300B56A1800A75C0D00FFFFFF00FFFFFF00FFFFFF00A75C - 0D00B56A1800C3792300D2872E00DE93375CDF9438CCFFE599FFDF9438CCDE93 - 375CD2872E00C3792300B56A1800A75C0D00FFFFFF00FFFFFF00FFFFFF00A75C - 0D00B56A1800C3792300D2872E00DF943800E79C3E5CE89D3FCCE79C3E5CDF94 - 3800D2872E00C3792300B56A1800A75C0D00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 - } end object SpeedButton3: TSpeedButton Left = 3 @@ -471,42 +391,6 @@ object MainForm: TMainForm Width = 23 Action = AcFindClose Flat = True - Glyph.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00000072000000614800005FCC000061480000720000008200000082000000 - 72000000614800005FCC0000614800007200FFFFFF00FFFFFF00FFFFFF00FFFF - FF0000007548000072CC1111D8FF000072CC0000754800008200000082000000 - 7548000072CC1111D8FF000072CC00007548FFFFFF00FFFFFF00FFFFFF00FFFF - FF00000082CC1111D0FF1111D0FF1111D0FF000082CC00008348000083480000 - 82CC1111D0FF1111D0FF1111D0FF000082CCFFFFFF00FFFFFF00FFFFFF00FFFF - FF0000008748000087CC1111C4FF1111C4FF1111C4FF000087CC000087CC1111 - C4FF1111C4FF1111C4FF000087CC00008748FFFFFF00FFFFFF00FFFFFF00FFFF - FF000000870000008C4800008DCC1111B8FF1111B8FF1111B8FF1111B8FF1111 - B8FF1111B8FF00008DCC00008C4800008700FFFFFF00FFFFFF00FFFFFF00FFFF - FF000000870000008D0000009148000092CC1515AFFF1111ACFF1111ACFF1111 - ACFF000092CC0000914800008D0000008700FFFFFF00FFFFFF00FFFFFF00FFFF - FF000000A00000009B0000009848000097CC2525B4FF1111A2FF1111A2FF1414 - A5FF000097CC0000984800009B000000A000FFFFFF00FFFFFF00FFFFFF00FFFF - FF000000A00000009C4800009BCC5353DBFF2E2EB7FF3D3DC6FF3131BAFF1515 - 9FFF1E1EA8FF00009BCC00009C480000A000FFFFFF00FFFFFF00FFFFFF00FFFF - FF000000A1480000A0CC6767EFFF3636BEFF5E5EE6FF0000A0CC0000A0CC4F4F - D7FF3636BEFF4545CDFF0000A0CC0000A148FFFFFF00FFFFFF00FFFFFF00FFFF - FF000000A3CC7676FEFF4C4CD4FF7272FAFF0000A3CC0000A3480000A3480000 - A3CC6262EAFF4C4CD4FF5C5CE4FF0000A3CCFFFFFF00FFFFFF00FFFFFF00FFFF - FF000000A7480000A7CC7777FFFF0000A7CC0000A7480000A3000000A3000000 - A7480000A7CC7070F8FF0000A7CC0000A748FFFFFF00FFFFFF00FFFFFF00FFFF - FF000000A7000000AA480000AACC0000AA480000A7000000A3000000A3000000 - A7000000AA480000AACC0000AA480000A700FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 - } end object CbFind: TComboBox Left = 28 diff --git a/components/fpspreadsheet/reference/BIFFExplorer/bemain.pas b/components/fpspreadsheet/reference/BIFFExplorer/bemain.pas index fd1bb0569..be5670872 100644 --- a/components/fpspreadsheet/reference/BIFFExplorer/bemain.pas +++ b/components/fpspreadsheet/reference/BIFFExplorer/bemain.pas @@ -69,7 +69,6 @@ type FindPanel: TPanel; SaveDialog: TSaveDialog; SpeedButton3: TSpeedButton; - StringGrid1: TStringGrid; TreePopupMenu: TPopupMenu; TreePanel: TPanel; BtnFindNext: TSpeedButton; @@ -1056,7 +1055,7 @@ begin sw[j] := WideChar(w); end; SetLength(sw, j); - ValueGrid.Cells[1, VALUE_ROW_WIDESTRING] := UTF8Decode(sw); + ValueGrid.Cells[1, VALUE_ROW_WIDESTRING] := UTF8Encode(sw); ValueGrid.Cells[2, VALUE_ROW_WIDESTRING] := Format('%d ... %d', [idx, idx + ls*SizeOf(wideChar)+1]); end else begin ValueGrid.Cells[1, VALUE_ROW_WIDESTRING] := '';