diff --git a/components/fpspreadsheet/examples/visual/fpsctrls/main.lfm b/components/fpspreadsheet/examples/visual/fpsctrls/main.lfm
index 6ff3a05fe..a1e6105f7 100644
--- a/components/fpspreadsheet/examples/visual/fpsctrls/main.lfm
+++ b/components/fpspreadsheet/examples/visual/fpsctrls/main.lfm
@@ -8,7 +8,7 @@ object Form1: TForm1
ClientWidth = 997
Menu = MainMenu1
ShowHint = True
- LCLVersion = '1.9.0.0'
+ LCLVersion = '1.6.4.0'
object sWorkbookTabControl1: TsWorkbookTabControl
Left = 0
Height = 542
@@ -61,22 +61,22 @@ object Form1: TForm1
Images = ImageList1
TabOrder = 1
object ToolButton6: TToolButton
- Left = 352
+ Left = 371
Top = 0
Action = sFontStyleAction1
end
object ToolButton7: TToolButton
- Left = 376
+ Left = 395
Top = 0
Action = sFontStyleAction2
end
object ToolButton8: TToolButton
- Left = 400
+ Left = 419
Top = 0
Action = sFontStyleAction3
end
object FontNameCombo: TsCellCombobox
- Left = 54
+ Left = 73
Height = 23
Hint = 'Cell font name'
Top = 0
@@ -89,7 +89,7 @@ object Form1: TForm1
Text = 'Arial'
end
object FontSizeCombo: TsCellCombobox
- Left = 184
+ Left = 203
Height = 23
Hint = 'Cell font size'
Top = 0
@@ -102,7 +102,7 @@ object Form1: TForm1
Text = '10'
end
object FontColorCombobox: TsCellCombobox
- Left = 232
+ Left = 251
Height = 24
Hint = 'Font color'
Top = 0
@@ -130,6 +130,7 @@ object Form1: TForm1
Left = 49
Height = 26
Top = 0
+ Width = 24
Caption = 'ToolButton3'
Style = tbsDivider
end
@@ -174,7 +175,6 @@ object Form1: TForm1
BorderSpacing.Right = 2
BorderSpacing.Bottom = 3
TabOrder = 1
- WantReturns = False
WorkbookSource = sWorkbookSource1
end
object Splitter2: TSplitter
@@ -462,15 +462,123 @@ object Form1: TForm1
Caption = 'File'
object MnuFileOpen: TMenuItem
Action = FileOpen1
+ Bitmap.Data = {
+ 36040000424D3604000000000000360000002800000010000000100000000100
+ 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
+ FF00005D8C000064970000629300005E8E30005C8C7C0059879200598700005B
+ 8900005B8900005B8900005B8900005D8C0000669900FFFFFF00FFFFFF00FFFF
+ FF00005D8C0000659950006497991C7AA9C052A5CDE0005B89C1005B8900005B
+ 8900005B8900005B8900005B8900005D8C0000669900FFFFFF00FFFFFF00FFFF
+ FF00005E8D8E3591BDF169B8DDFA81CBECFF84CEEEFF005C8BEF005D8CBE005D
+ 8CBE005D8CBE005D8CBE005D8CBE005E8D8E00669900FFFFFF00FFFFFF00FFFF
+ FF00006699B287D1EFFF7FCAE9FF7FCAE9FF87D0EFFF267DA9FF8DD1F3FF8DD1
+ F3FF8DD1F3FF8DD1F3FF90D4F5FF006699B200679B3EFFFFFF00FFFFFF00FFFF
+ FF00006FA7A48AD3F0FF82CDEBFF82CDEBFF8AD3F0FF267EABFF8ACEF0FF8ACE
+ F0FF8ACEF0FF8ACEF0FF8FD3F4FFF4B62EFF006FA7A4FFFFFF00FFFFFF00FFFF
+ FF000073AC9E8ED6F2FF87D0EDFF87D0EDFF8ED6F2FF2882AFFF8BCFF1FF8BCF
+ F1FF8BCFF1FF8BCFF1FF91D5F5FFFEC941FF0073AC9EFFFFFF00FFFFFF00FFFF
+ FF000076B09B92DAF4FF8BD4F0FF8BD4F0FF92DAF4FF2B85B3FF8DD1F3FF8DD1
+ F3FF8DD1F3FF8DD1F3FF93D7F6FFEBEBDDFF0076B09BFFFFFF00FFFFFF00FFFF
+ FF000078B49797DEF6FF90D8F2FF90D8F2FF97DEF6FF2D89B7FF8FD3F5FF8FD3
+ F5FF8FD3F5FF8FD3F5FF95D9F8FFF5F5EEFF0078B497FFFFFF00FFFFFF00FFFF
+ FF00007BB8949BE1F7FF94DBF4FF94DBF4FF9BE1F7FF308DBCFF90D4F6FF90D4
+ F6FF90D4F6FF90D4F6FF97DBF9FFFEFEFDFF007BB894FFFFFF00FFFFFF00FFFF
+ FF00007DBB909EE5F9FF98DFF6FF98DFF6FF9EE5F9FF3290C0FF92D6F8FF92D6
+ F8FF92D6F8FF92D6F8FF99DDFAFF007DBB90007DBB33FFFFFF00FFFFFF00FFFF
+ FF00007FBF8DA3E8FBFF9DE3F9FF9DE3F9FFA3E8FBFF3594C5FF94D8FAFF94D8
+ FAFF94D8FAFF94D8FAFF9BDFFCFF007FBF8D007FBE00FFFFFF00FFFFFF00FFFF
+ FF000082C28AA6EBFCFFA1E6FBFFA1E6FBFFA6EBFCFF3C9DCFFF96DAFCFF96DA
+ FCFF96DAFCFF96DAFCFF9EE2FDFF0082C28A0082C200FFFFFF00FFFFFF00FFFF
+ FF000084C587A9EEFDFFA4E9FCFFA4E9FCFFAAEEFDFF42A1D1FF97DBFDFF97DB
+ FDFF97DBFDFF97DBFDFF9FE3FEFF0084C5870084C500FFFFFF00FFFFFF00FFFF
+ FF000085C885ACF1FFFFABEFFEFF95E2F8FF6EC9EDFF48A8D9FF98DCFEFF98DC
+ FEFF98DCFEFF98DCFEFFA1E5FFFF0085C8850085C800FFFFFF00FFFFFF00FFFF
+ FF000087CA8388DCF4FF60C0E9FF5FBFEAFF80D3F4FF9CE3FDFFA2E6FFFFA2E6
+ FFFFA2E6FFFFA2E6FFFFA6EAFFFF0087CA830087CA00FFFFFF00FFFFFF00FFFF
+ FF000088CC610088CC810088CC810088CC810088CC810088CC810088CC810088
+ CC810088CC810088CC810088CC810088CC610087CB00FFFFFF00
+ }
end
object MnuFileSaveAs: TMenuItem
Action = FileSaveAs1
+ Bitmap.Data = {
+ 36040000424D3604000000000000360000002800000010000000100000000100
+ 2000000000000004000064000000640000000000000000000000BA6A3600B969
+ 35B5B86935EEB76835FFB56835FFB46734FFB26634FFB06533FFAE6433FFAC63
+ 32FFAA6232FFA96132FFA86031FFA76031FEA66031F1A86131C4BA6A35DEEBC6
+ ADFFEAC5ADFFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFB
+ F8FFFEFBF8FFFEFBF8FFFEFBF8FFC89A7CFFC79879FFA76031EDBA6B37FEEDCA
+ B3FFE0A27AFFFEFAF7FF62C088FF62C088FF62C088FF62C088FF62C088FF62C0
+ 88FF62C088FF62C088FFFDF9F6FFCA8D65FFC99B7CFFA76031FEBB6C38FFEECC
+ B6FFE1A27AFFFEFAF7FFBFDCC2FFBFDCC2FFBFDCC2FFBFDCC2FFBFDCC2FFBFDC
+ C2FFBFDCC2FFBFDCC2FFFDF9F6FFCD9068FFCC9E81FFA86132FFBB6B38FFEFCE
+ B8FFE1A279FFFEFAF7FF62C088FF62C088FF62C088FF62C088FF62C088FF62C0
+ 88FF62C088FF62C088FFFDF9F6FFCF936AFFCEA384FFAA6132FFBA6A36FFEFD0
+ BBFFE2A27AFFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFB
+ F8FFFEFBF8FFFEFBF8FFFEFBF8FFD3966DFFD2A78AFFAB6232FFBB6A36FFF0D2
+ BEFFE2A37AFFE2A37AFFE1A37AFFE2A37BFFE1A37BFFE0A178FFDE9F77FFDD9F
+ 76FFDC9D74FFD99B72FFD89971FFD69970FFD5AB8EFFAD6333FFBB6A36FFF2D5
+ C2FFE3A37AFFE3A37AFFE2A37BFFE2A37BFFE2A47BFFE1A279FFE0A178FFDEA0
+ 77FFDE9E75FFDC9D74FFDA9B73FFD99B73FFDAB095FFAF6433FFBB6A36FFF2D8
+ C5FFE3A47BFFE3A37AFFE3A47AFFE2A47BFFE2A37BFFE1A37BFFE1A279FFDFA0
+ 77FFDE9F76FFDD9E74FFDB9C72FFDC9D74FFDDB59AFFB16534FFBB6B36FFF4D9
+ C7FFE6A67DFFC88C64FFC98D65FFC98E67FFCB926CFFCB926DFFCA9069FFC88C
+ 65FFC88C64FFC88C64FFC88C64FFDA9C74FFE1BA9FFFB36634FFBB6B36FEF4DC
+ C9FFE7A77DFFF9ECE1FFF9ECE1FFF9EDE3FFFCF4EEFFFDFAF7FFFDF7F3FFFAED
+ E5FFF7E7DBFFF7E5D9FFF6E5D8FFDEA077FFE4BEA4FFB46734FFBC6B36FAF5DD
+ CCFFE7A87EFFFAF0E8FFFAF0E8FFC98D66FFFAF0E9FFFDF8F3FFFEFAF8FFFCF4
+ EFFFF9E9DFFFF7E7DBFFF7E5D9FFE0A278FFE7C2A9FFB66835FFBC6B36F0F6DF
+ D0FFE8A87EFFFCF6F1FFFCF6F1FFC88C64FFFAF1E9FFFBF4EEFFFDFAF7FFFDF9
+ F6FFFAF0E8FFF8E8DDFFF7E6DBFFE1A37AFFEFD5C3FFB76935FEBC6B36D8F6DF
+ D1FFE9AA80FFFEFAF6FFFDFAF6FFC88C64FFFBF3EEFFFBF1EAFFFCF6F2FFFEFB
+ F8FFFCF6F1FFF9ECE2FFF8E7DBFFEED0BAFFECD0BDFFBB703EF8BC6B369BF6E0
+ D1FFF7E0D1FFFEFBF8FFFEFBF7FFFDF9F6FFFCF5F0FFFAF0EAFFFBF2EDFFFDF9
+ F6FFFDFAF7FFFBF1EBFFF8E9DFFEECD0BDFBC9895EECB5693563BC6B3671BC6B
+ 3690BC6B36CCBC6B36EEBC6B36FABB6B36FEBB6B36FFBB6A36FFBB6A36FFBC6C
+ 39FFBD6E3BFFBB6D3AFFBB6B38EFBB703ECBB6693554FFFFFF00
+ }
end
object MnuFileSeparator: TMenuItem
Caption = '-'
end
object MnuFileExit: TMenuItem
Action = FileExit1
+ Bitmap.Data = {
+ 36040000424D3604000000000000360000002800000010000000100000000100
+ 200000000000000400006400000064000000000000000000000000105500000B
+ 4FCC0007498A0005462400054700000648000006470000044500000445000004
+ 4500000445000004450000044500000445000006480000084B00001B64CC4174
+ B8FF2A5094EC0A1A5ED300084A8A000648240006470000044500000445000004
+ 4500000445000004450000044500000445000006480000084B0000226DCC3F72
+ B6FF225599FF3B6EB2FF2C5196EC0A1C60D3000749A4000648CC000648CC0006
+ 48CC000648CC000648CC000648CC000648CC00074A9900084B00002571CC4174
+ B8FF2C5FA3FF2D60A4FF23569AFF3D70B4FF334179FFBEBEBEFFD5D5D5FFD8D8
+ D8FFDBDBDBFFDCDCDCFFDDDDDDFFDDDDDDFF001258CC00125800002875CC4477
+ BBFF2C5FA3FF3568ACFF2B5EA2FF2E61A5FF334B87FFBBBBBBFFD3D3D3FFD5D5
+ D5FFD8D8D8FFDBDBDBFFDCDCDCFFDDDDDDFF001F68CC001F6800002B79CC477A
+ BEFF2C5FA3FF376AAEFF2B5EA2FF376AAEFF33508CFFB8B8B8FFD0D0D0FFD3D3
+ D3FFD5D5D5FFAAAAAAFFBEBEBEFFDCDCDCFF00246FCC00246F00002E7DCC497C
+ C0FF09336FFF215090FF2B5EA2FF396CB0FF335290FFB5B5B5FFCCCCCCFFD0D0
+ D0FFD3D3D3FF9D9D9DFF9D9D9DFFBFBFBFFF002774CC00277400003181CC4C7F
+ C3FFBBBBBBFF22518CFF2C5FA3FF3B6EB2FF335593FFB3B3B3FFAAAAAAFFA0A0
+ A0FFA0A0A0FFA0A0A0FFE4E4E4FFA0A0A0FF051E4D950B204600003485CC5083
+ C7FF1D5094FF3265A9FF2D60A4FF3D70B4FF335897FFB0B0B0FFA2A2A2FFF2F2
+ F2FFF2F2F2FFF2F2F2FFF2F2F2FFF2F2F2FF1A1A1A661A1A1A1A003688CC5386
+ CAFF295CA0FF3F72B6FF3063A7FF3F72B6FF335A9AFFAEAEAEFFACACACFFA5A5
+ A5FFA5A5A5FFA5A5A5FFFDFDFDFFA5A5A5FF122F60951029510000398BCC5588
+ CCFF275A9EFF4174B8FF3164A8FF4174B8FF335D9EFFACACACFFC1C1C1FFC4C4
+ C4FFC7C7C7FFA8A8A8FFA8A8A8FFBEBEBEFF003485CC00348500003B8ECC588B
+ CFFF1A4D91FF4376BAFF3265A9FF4376BAFF335FA1FFAAAAAAFFBFBFBFFFC1C1
+ C1FFC4C4C4FFB1B1B1FFBBBBBBFFCCCCCCFF003789CC00378900003D91CC5D90
+ D4FF3568ACFF285B9FFF1A4D91FF4477BBFF3361A4FFA9A9A9FFBDBDBDFFBFBF
+ BFFFC1C1C1FFC4C4C4FFC7C7C7FFC9C9C9FF003A8DCC003A8D00003F938A0E4A
+ 9CD33E75BFEC5487CBFF3669ADFF23569AFF3363A6FFA9A9A9FFBCBCBCFFBDBD
+ BDFFBFBFBFFFC1C1C1FFC4C4C4FFC7C7C7FF003C90CC003C9000003F9300003F
+ 9324003F938A0E4B9CD33F76C0EC5D90D4FF3365A9FFA0A0A0FFA9A9A9FFA9A9
+ A9FFAAAAAAFFACACACFFAEAEAEFFB0B0B0FF003E93CC003E9300003F9300003F
+ 9300003F9300003F9424003F948A003E93CC004095CC004095CC004095CC0040
+ 95CC004095CC004095CC004095CC004095CC00409599003F9400
+ }
end
end
object MnuFormat: TMenuItem
@@ -478,14 +586,122 @@ object Form1: TForm1
object MnuFormatBold: TMenuItem
Action = sFontStyleAction1
AutoCheck = True
+ Bitmap.Data = {
+ 36040000424D3604000000000000360000002800000010000000100000000100
+ 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF003C3C3C60343434AF2D2D2DBF262626BF1F1F1F8F1919198F1313
+ 13BF0D0D0D8F09090920FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF003D3D3D7F404040FF2F2F2FCFFFFFFF00FFFFFF001B1B
+ 1B70242424FF0F0F0FEF0A0A0A20FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF004646467F464646FF383838BFFFFFFF00FFFFFF00FFFF
+ FF001C1C1CFF292929FF1010107FFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF004F4F4F7F4D4D4DFF414141BFFFFFFF00FFFFFF002B2B
+ 2B10262626FF2D2D2DFF17171770FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF005858587F535353FF4A4A4ABFFFFFFF00FFFFFF003434
+ 349F383838FF262626CF1F1F1F10FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF006060607F595959FF535353DF4C4C4C7F454545CF4444
+ 44FF363636BFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF006767677F5F5F5FFF5B5B5BBFFFFFFF004D4D4D104646
+ 46DF464646FF3838389FFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF006D6D6D7F656565FF636363BFFFFFFF00FFFFFF004F4F
+ 4F7F4E4E4EFF414141FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF007373737F696969FF6A6A6ABFFFFFFF00FFFFFF005858
+ 589F545454FF4A4A4ACFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF0077777760777777CF747474FF707070EF6B6B6B7F656565AF6060
+ 60EF5959599F53535310FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
+ }
end
object MnuFormatItalic: TMenuItem
Action = sFontStyleAction2
AutoCheck = True
+ Bitmap.Data = {
+ 36040000424D3604000000000000360000002800000010000000100000000100
+ 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00343434802D2D2DC0262626C01F1F1FC0191919B0FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF0036363640353535FF282828FFFFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00383838E0383838FF2A2A2A50FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0041414190444444FF323232A0FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF004A4A4A30454545FF3C3C3CF0FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF004C4C4CE0494949FF3D3D
+ 3D50FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0054545490525252FF4646
+ 46A0FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF005C5C5C30575757FF4F4F
+ 4FF0FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF005E5E5EE05959
+ 59FF51515160FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF006B6B6B80656565F06060
+ 60FF595959F0535353C0FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
+ }
end
object MnuFormatUnderline: TMenuItem
Action = sFontStyleAction3
AutoCheck = True
+ Bitmap.Data = {
+ 36040000424D3604000000000000360000002800000010000000100000000100
+ 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF002B2B2BFF242424FF1E1E1EFF171717FF121212FF0C0C
+ 0CFF070707FF030303FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00363636202F2F2F9F282828BF212121BF1B1B
+ 1B8F14141430FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00464646203F3F3FEF383838CF31313120FFFFFF002323
+ 23401C1C1CCF16161620FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF004F4F4F8F4B4B4BFF41414150FFFFFF00FFFFFF00FFFF
+ FF00242424401E1E1E8FFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00585858BF515151FFFFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00262626BFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00606060BF595959FFFFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF002F2F2FBFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00676767BF616161FFFFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00383838BFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF006D6D6DBF686868FFFFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00414141BFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00737373BF6E6E6EFFFFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF004A4A4ABFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00777777BF747474FFFFFFFF00FFFFFF00FFFFFF00FFFF
+ FF0059595910535353CFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF0077777760777777EF777777FF7575758FFFFFFF00FFFFFF00FFFF
+ FF00616161AF5B5B5BFF54545470FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
+ }
end
end
end
diff --git a/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas b/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas
index 063e3369b..46d979dfe 100644
--- a/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas
+++ b/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas
@@ -1875,7 +1875,8 @@ function TsCellEdit.CanEditCell(ARow, ACol: Cardinal): Boolean;
var
cell: PCell;
begin
- cell := Worksheet.Findcell(Worksheet.ActiveCellRow, Worksheet.ActiveCellCol);
+// cell := Worksheet.Findcell(Worksheet.ActiveCellRow, Worksheet.ActiveCellCol);
+ cell := Worksheet.FindCell(ARow, ACol);
Result := CanEditCell(cell);
end;
diff --git a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
index dda1ecef5..231c3e3d7 100644
--- a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
@@ -1189,6 +1189,7 @@ end;
procedure TMultilineStringCellEditor.msg_SelectAll(var Msg: TGridMessage);
begin
+ Unused(Msg);
SelectAll;
end;
@@ -1497,8 +1498,10 @@ end;
function TsCustomWorksheetGrid.CalcTopLeft(AHeaderOnly: Boolean): TPoint;
var
fc, fr: Integer;
- tmp: Integer;
+ tmp: Integer = 0;
begin
+ Result := Point(0, 0); // to silence the compiler...
+
fc := IfThen(AHeaderOnly, FHeaderCount, FHeaderCount + FFrozenCols);
if IsRightToLeft then
begin
@@ -1696,9 +1699,9 @@ function TsCustomWorksheetGrid.CellRect(ACol1, ARow1, ACol2, ARow2: Integer): TR
var
cmin, cmax: Integer;
rmin, rmax: Integer;
- tmp: Integer;
- R: TRect;
+ tmp: Integer = 0;
begin
+ Result := Rect(0, 0, 0, 0); // to silence the compiler...
cmin := Min(ACol1, ACol2);
cmax := Max(ACol1, ACol2);
rmin := Min(ARow1, ARow2);
@@ -2558,7 +2561,6 @@ procedure TsCustomWorksheetGrid.DrawImages(AGridPart: Integer);
procedure CalcClipRect(var ARect: TRect);
var
- tmp: Integer;
headerTL: TPoint;
begin
ARect := ClientRect;
@@ -2615,7 +2617,8 @@ procedure TsCustomWorksheetGrid.DrawImages(AGridPart: Integer);
procedure GetScrollOffset(out ARowDelta, AColDelta: Integer);
var
tmp: Integer;
- x, y: Integer;
+ x: Integer = 0;
+ y: Integer = 0;
begin
AColDelta := 0;
if FrozenCols > 0 then begin
@@ -2643,10 +2646,12 @@ procedure TsCustomWorksheetGrid.DrawImages(AGridPart: Integer);
function GetImageRect(img: PsImage; AWidth, AHeight: Integer;
ARowDelta, AColDelta: Integer): TRect;
var
- tmp: Integer;
+ tmp: Integer = 0;
gcol, grow: Integer;
relativeX, relativeY: Boolean;
begin
+ Result := Rect(0, 0, 0, 0); // To silence the compiler
+
grow := GetGridRow(img^.row);
gcol := GetGridCol(img^.Col);
@@ -2659,11 +2664,13 @@ procedure TsCustomWorksheetGrid.DrawImages(AGridPart: Integer);
DRAW_FROZEN_COLS:
begin
relativeX := true;
- relativeY := not ((img^.Row < FrozenRows) and (img^.Col < FrozenCols));
+ relativeY := not ((integer(img^.Row) < FrozenRows) and
+ (integer(img^.Col) < FrozenCols));
end;
DRAW_FROZEN_ROWS:
begin
- relativeX := not ((img^.Row < FrozenRows) and (img^.Col < FrozenCols));
+ relativeX := not ((integer(img^.Row) < FrozenRows) and
+ (integer(img^.Col) < FrozenCols));
relativeY := true;
end;
DRAW_FROZEN_CORNER:
@@ -2704,12 +2711,14 @@ var
i: Integer;
img: PsImage;
obj: TsEmbeddedObj;
- clipArea, imgRect, R: TRect;
+ clipArea: TRect = (Left:0; Top:0; Right:0; Bottom:0);
+ imgRect: TRect;
w, h: Integer;
coloffs, rowoffs: Integer;
pic: TPicture;
rgn: HRGN;
fc, fr: Integer;
+ R: TRect = (Left:0; Top:0; Right: 0; Bottom: 0);
begin
if Worksheet.GetImageCount = 0 then
exit;
@@ -2731,10 +2740,14 @@ begin
// Frozen part of the grid draw only images which are anchored there.
case AGridPart of
- DRAW_NON_FROZEN : ;
- DRAW_FROZEN_ROWS : if (img^.Row >= fr) then Continue;
- DRAW_FROZEN_COLS : if (img^.Col >= fc) then Continue;
- DRAW_FROZEN_CORNER: if (img^.Row >= fr) or (img^.Col >= fc) then Continue;
+ DRAW_NON_FROZEN:
+ ;
+ DRAW_FROZEN_ROWS:
+ if (integer(img^.Row) >= fr) then Continue;
+ DRAW_FROZEN_COLS:
+ if (integer(img^.Col) >= fc) then Continue;
+ DRAW_FROZEN_CORNER:
+ if (integer(img^.Row) >= fr) or (integer(img^.Col) >= fc) then Continue;
end;
// Size of image and its position
@@ -4055,7 +4068,7 @@ begin
wdef := Worksheet.ReadDefaultColWidth(Workbook.Units);
if (AIndex >= FHeaderCount) and not SameValue(w, wdef, EPS) then begin
idx := GetWorksheetCol(AIndex);
- Worksheet.WriteColWidth(GetWorksheetCol(AIndex), w, Workbook.Units);
+ Worksheet.WriteColWidth(idx, w, Workbook.Units);
end;
end else
begin
@@ -4063,7 +4076,7 @@ begin
hdef := Worksheet.ReadDefaultRowHeight(Workbook.Units);
if (AIndex >= FHeaderCount) and not SameValue(h, hdef, EPS) then begin
idx := GetWorksheetRow(AIndex);
- Worksheet.WriteRowHeight(GetWorksheetRow(AIndex), h, Workbook.Units);
+ Worksheet.WriteRowHeight(idx, h, Workbook.Units);
end;
end;
end;
@@ -5049,8 +5062,8 @@ var
cell: PCell;
cp: TsCellprotections;
begin
- Result := true;
- if Worksheet.IsProtected then
+ Result := inherited;
+ if Result and Worksheet.IsProtected then
begin
cell := Worksheet.FindCell(GetWorksheetRow(ARow), GetWorksheetCol(ACol));
cp := Worksheet.ReadCellProtection(cell);
diff --git a/components/fpspreadsheet/tests/spreadtestgui.lpi b/components/fpspreadsheet/tests/spreadtestgui.lpi
index 03ae8d1ed..9649cf21e 100644
--- a/components/fpspreadsheet/tests/spreadtestgui.lpi
+++ b/components/fpspreadsheet/tests/spreadtestgui.lpi
@@ -7,11 +7,7 @@
-
-
-
-
diff --git a/components/fpspreadsheet/tests/spreadtestgui.lpr b/components/fpspreadsheet/tests/spreadtestgui.lpr
index cff3d0e01..edb225bfe 100644
--- a/components/fpspreadsheet/tests/spreadtestgui.lpr
+++ b/components/fpspreadsheet/tests/spreadtestgui.lpr
@@ -16,7 +16,6 @@ uses
hyperlinktests, pagelayouttests, protectiontests;
begin
- Application.Scaled := True;
{$IFDEF HEAPTRC}
// Assuming your build mode sets -dDEBUG in Project Options/Other when defining -gh
// This avoids interference when running a production/default build without -gh