From 46a94e0abfe3c2d367b95b9ee2abc609b995afa3 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Tue, 7 Oct 2014 22:53:52 +0000 Subject: [PATCH] fpspreadsheet: Fix xlsx reader truncating strings after 255 characters due to missing $H+ directive. Check that all units use the $H+. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3637 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/fpspreadsheet/fpolestorage.pas | 2 +- components/fpspreadsheet/fpsfunc.pas | 2 +- components/fpspreadsheet/fpsnumformatparser.pas | 2 +- components/fpspreadsheet/fpsopendocument.pas | 2 +- components/fpspreadsheet/fpspreadsheet.pas | 2 +- components/fpspreadsheet/fpsrpn.pas | 2 +- components/fpspreadsheet/fpsstreams.pas | 4 ++++ components/fpspreadsheet/fpsstrings.pas | 2 +- components/fpspreadsheet/fpsxmlcommon.pas | 2 +- components/fpspreadsheet/wikitable.pas | 1 + components/fpspreadsheet/xlsbiff2.pas | 2 +- components/fpspreadsheet/xlsbiff5.pas | 2 +- components/fpspreadsheet/xlsbiff8.pas | 2 +- components/fpspreadsheet/xlscommon.pas | 2 +- components/fpspreadsheet/xlsconst.pas | 4 ++++ 15 files changed, 21 insertions(+), 12 deletions(-) diff --git a/components/fpspreadsheet/fpolestorage.pas b/components/fpspreadsheet/fpolestorage.pas index b94923b34..10084644b 100755 --- a/components/fpspreadsheet/fpolestorage.pas +++ b/components/fpspreadsheet/fpolestorage.pas @@ -30,7 +30,7 @@ but should work for most documents. Some limitations are: unit fpolestorage; {$ifdef fpc} -{$mode delphi} +{$mode delphi}{$H+} {$endif} interface diff --git a/components/fpspreadsheet/fpsfunc.pas b/components/fpspreadsheet/fpsfunc.pas index ac6cd8c1c..60aebdcfd 100644 --- a/components/fpspreadsheet/fpsfunc.pas +++ b/components/fpspreadsheet/fpsfunc.pas @@ -4,7 +4,7 @@ unit fpsfunc; -{$mode objfpc} +{$mode objfpc}{$H+} interface diff --git a/components/fpspreadsheet/fpsnumformatparser.pas b/components/fpspreadsheet/fpsnumformatparser.pas index 2b050be5c..00995f66a 100644 --- a/components/fpspreadsheet/fpsnumformatparser.pas +++ b/components/fpspreadsheet/fpsnumformatparser.pas @@ -1,7 +1,7 @@ unit fpsNumFormatParser; {$ifdef fpc} - {$mode delphi} + {$mode delphi}{$H+} {$endif} interface diff --git a/components/fpspreadsheet/fpsopendocument.pas b/components/fpspreadsheet/fpsopendocument.pas index 7f9559cc3..000b77bae 100755 --- a/components/fpspreadsheet/fpsopendocument.pas +++ b/components/fpspreadsheet/fpsopendocument.pas @@ -23,7 +23,7 @@ AUTHORS: Felipe Monteiro de Carvalho / Jose Luis Jurado Rincon unit fpsopendocument; {$ifdef fpc} - {$mode delphi} + {$mode delphi}{$H+} {$endif} {.$define FPSPREADDEBUG} //used to be XLSDEBUG diff --git a/components/fpspreadsheet/fpspreadsheet.pas b/components/fpspreadsheet/fpspreadsheet.pas index ab647037f..8c5be5b05 100755 --- a/components/fpspreadsheet/fpspreadsheet.pas +++ b/components/fpspreadsheet/fpspreadsheet.pas @@ -8,7 +8,7 @@ AUTHORS: Felipe Monteiro de Carvalho unit fpspreadsheet; {$ifdef fpc} - {$mode delphi} + {$mode delphi}{$H+} {$endif} interface diff --git a/components/fpspreadsheet/fpsrpn.pas b/components/fpspreadsheet/fpsrpn.pas index 9a54820d4..577c00a64 100644 --- a/components/fpspreadsheet/fpsrpn.pas +++ b/components/fpspreadsheet/fpsrpn.pas @@ -3,7 +3,7 @@ unit fpsRPN; {$ifdef fpc} - {$mode delphi} + {$mode delphi}{$H+} {$endif} interface diff --git a/components/fpspreadsheet/fpsstreams.pas b/components/fpspreadsheet/fpsstreams.pas index 2a9d81276..c285aef73 100644 --- a/components/fpspreadsheet/fpsstreams.pas +++ b/components/fpspreadsheet/fpsstreams.pas @@ -1,5 +1,9 @@ unit fpsStreams; +{$ifdef fpc} + {$mode delphi}{$H+} +{$endif} + interface uses diff --git a/components/fpspreadsheet/fpsstrings.pas b/components/fpspreadsheet/fpsstrings.pas index 45c38c7f8..8acba7624 100644 --- a/components/fpspreadsheet/fpsstrings.pas +++ b/components/fpspreadsheet/fpsstrings.pas @@ -3,7 +3,7 @@ unit fpsStrings; {$ifdef fpc} - {$mode delphi} + {$mode delphi}{$H+} {$endif} diff --git a/components/fpspreadsheet/fpsxmlcommon.pas b/components/fpspreadsheet/fpsxmlcommon.pas index 74823118d..9e2e542da 100644 --- a/components/fpspreadsheet/fpsxmlcommon.pas +++ b/components/fpspreadsheet/fpsxmlcommon.pas @@ -3,7 +3,7 @@ unit fpsxmlcommon; -{$mode objfpc} +{$mode objfpc}{$H+} interface diff --git a/components/fpspreadsheet/wikitable.pas b/components/fpspreadsheet/wikitable.pas index 2766352c9..1263c3f1e 100644 --- a/components/fpspreadsheet/wikitable.pas +++ b/components/fpspreadsheet/wikitable.pas @@ -21,6 +21,7 @@ Format mediawiki: AUTHORS: Felipe Monteiro de Carvalho *) + unit wikitable; {$mode objfpc}{$H+} diff --git a/components/fpspreadsheet/xlsbiff2.pas b/components/fpspreadsheet/xlsbiff2.pas index 92eab1a81..cfe2c8884 100755 --- a/components/fpspreadsheet/xlsbiff2.pas +++ b/components/fpspreadsheet/xlsbiff2.pas @@ -27,7 +27,7 @@ AUTHORS: Felipe Monteiro de Carvalho unit xlsbiff2; {$ifdef fpc} - {$mode delphi} + {$mode delphi}{$H+} {$endif} interface diff --git a/components/fpspreadsheet/xlsbiff5.pas b/components/fpspreadsheet/xlsbiff5.pas index 24f90a05d..094d2d942 100755 --- a/components/fpspreadsheet/xlsbiff5.pas +++ b/components/fpspreadsheet/xlsbiff5.pas @@ -53,7 +53,7 @@ AUTHORS: Felipe Monteiro de Carvalho unit xlsbiff5; {$ifdef fpc} - {$mode delphi} + {$mode delphi}{$H+} {$endif} {$define USE_NEW_OLE} diff --git a/components/fpspreadsheet/xlsbiff8.pas b/components/fpspreadsheet/xlsbiff8.pas index ce4041000..363df2354 100755 --- a/components/fpspreadsheet/xlsbiff8.pas +++ b/components/fpspreadsheet/xlsbiff8.pas @@ -45,7 +45,7 @@ AUTHORS: Felipe Monteiro de Carvalho unit xlsbiff8; {$ifdef fpc} - {$mode delphi} + {$mode delphi}{$H+} {$endif} // The new OLE code is much better, so always use it diff --git a/components/fpspreadsheet/xlscommon.pas b/components/fpspreadsheet/xlscommon.pas index e9b3fad18..dc6931180 100644 --- a/components/fpspreadsheet/xlscommon.pas +++ b/components/fpspreadsheet/xlscommon.pas @@ -4,7 +4,7 @@ unit xlscommon; OpenOffice Microsoft Excel File Format document } {$ifdef fpc} - {$mode delphi} + {$mode delphi}{$H+} {$endif} interface diff --git a/components/fpspreadsheet/xlsconst.pas b/components/fpspreadsheet/xlsconst.pas index 536daba60..20c49f72e 100644 --- a/components/fpspreadsheet/xlsconst.pas +++ b/components/fpspreadsheet/xlsconst.pas @@ -3,6 +3,10 @@ unit xlsconst; +{$ifdef fpc} + {$mode delphi}{$H+} +{$endif} + interface const