pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Fix compilation with Laz 1.0/2.6.0

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6182 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2018-02-07 00:01:31 +00:00
parent 383d872db7
commit 6edaaa7b11
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/fpspreadsheet/source/common/fpscrypto.pas
View File

@ -113,7 +113,11 @@ var
PassHash: Word = 0; PassHash: Word = 0;
begin begin
// we are needed to work with single byte character. // we are needed to work with single byte character.
{$IF fpc_fullversion >= 3000000 }
Password:= UTF8ToWinCP(APassword); Password:= UTF8ToWinCP(APassword);
{$ELSE}
Password := UTF8ToSys(APassword);
{$ENDIF}
PassLen := Length(Password); PassLen := Length(Password);
if PassLen = 0 then if PassLen = 0 then

5
components/fpspreadsheet/source/common/fpstypes.pas
View File

@ -10,6 +10,7 @@
unit fpsTypes; unit fpsTypes;
{$mode objfpc}{$H+} {$mode objfpc}{$H+}
{$include fps.inc}
interface interface
@ -276,6 +277,10 @@ type
{@@ Describes which formatting fields are active } {@@ Describes which formatting fields are active }
TsUsedFormattingFields = set of TsUsedFormattingField; TsUsedFormattingFields = set of TsUsedFormattingField;
{$IFDEF NO_RAWBYTESTRING}
RawByteString = ansistring;
{$ENDIF}
const const
{@@ Codes for curreny format according to FormatSettings.CurrencyFormat: {@@ Codes for curreny format according to FormatSettings.CurrencyFormat:
"C" = currency symbol, "V" = currency value, "S" = space character "C" = currency symbol, "V" = currency value, "S" = space character

6
components/fpspreadsheet/source/fps.inc
View File

@ -42,4 +42,10 @@
This is not yet available in fpc 2.6.0 } This is not yet available in fpc 2.6.0 }
{.$DEFINE FPS_PTRINT} {.$DEFINE FPS_PTRINT}
{ RawByteString only has been available since fpc 3.0
Activate this define to replace RawByteStringt by an ansistring }
{.$DEFINE NO_RAWBYTESTRING}