From 6edaaa7b11b618d57fc65c83a8aa48a189437c08 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Wed, 7 Feb 2018 00:01:31 +0000
Subject: [PATCH] fpspreadsheet: Fix compilation with Laz 1.0/2.6.0

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6182 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/fpspreadsheet/source/common/fpscrypto.pas | 4 ++++
 components/fpspreadsheet/source/common/fpstypes.pas  | 5 +++++
 components/fpspreadsheet/source/fps.inc              | 6 ++++++
 3 files changed, 15 insertions(+)

diff --git a/components/fpspreadsheet/source/common/fpscrypto.pas b/components/fpspreadsheet/source/common/fpscrypto.pas
index bd8f43cd5..c50fd8f74 100644
--- a/components/fpspreadsheet/source/common/fpscrypto.pas
+++ b/components/fpspreadsheet/source/common/fpscrypto.pas
@@ -113,7 +113,11 @@ var
   PassHash: Word = 0;
 begin
   // we are needed to work with single byte character.
+  {$IF fpc_fullversion >= 3000000 }
   Password:= UTF8ToWinCP(APassword);
+  {$ELSE}
+  Password := UTF8ToSys(APassword);
+  {$ENDIF}
   PassLen := Length(Password);
 
   if PassLen = 0 then
diff --git a/components/fpspreadsheet/source/common/fpstypes.pas b/components/fpspreadsheet/source/common/fpstypes.pas
index ade5c4dbe..bfb9d3380 100644
--- a/components/fpspreadsheet/source/common/fpstypes.pas
+++ b/components/fpspreadsheet/source/common/fpstypes.pas
@@ -10,6 +10,7 @@
 unit fpsTypes;
 
 {$mode objfpc}{$H+}
+{$include fps.inc}
 
 interface
 
@@ -276,6 +277,10 @@ type
   {@@ Describes which formatting fields are active }
   TsUsedFormattingFields = set of TsUsedFormattingField;
 
+  {$IFDEF NO_RAWBYTESTRING}
+  RawByteString = ansistring;
+  {$ENDIF}
+
 const
   {@@ Codes for curreny format according to FormatSettings.CurrencyFormat:
       "C" = currency symbol, "V" = currency value, "S" = space character
diff --git a/components/fpspreadsheet/source/fps.inc b/components/fpspreadsheet/source/fps.inc
index ba0622b31..e33e1699f 100644
--- a/components/fpspreadsheet/source/fps.inc
+++ b/components/fpspreadsheet/source/fps.inc
@@ -42,4 +42,10 @@
   This is not yet available in fpc 2.6.0 }
 {.$DEFINE FPS_PTRINT}
 
+{ RawByteString only has been available since fpc 3.0
+  Activate this define to replace RawByteStringt by an ansistring }
+{.$DEFINE NO_RAWBYTESTRING}
+
+
+