Skip to content

Commit 9a0e35e

Browse files
Roland-LannuzelRoland-Lannuzel
committed
get rid of _O_C_@
1 parent dd86381 commit 9a0e35e

File tree

281 files changed

+1454
-7801
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

281 files changed

+1454
-7801
lines changed

‎Project/Sources/Classes/TableWizard.4dm‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,10 @@ Function formulaUI($action : Text; $formatType : Integer; $insert : Object)
244244

245245

246246
$range:=WP Selection range:C1340(*; $insert.areaName)
247-
WP INSERT FORMULA:C1703($range; Formula from string:C1601($insert.source; 1); wk replace:K81:177) // ∆∆∆ Feature 125
247+
WP Insert formula:C1703($range; Formula from string:C1601($insert.source; 1); wk replace:K81:177) // ∆∆∆ Feature 125
248248
If ($insert.doNext="insertSpace")
249249
If (Shift down:C543)
250-
WP INSERT BREAK:C1413($range; wk paragraph break:K81:259; wk append:K81:179; wk include in range:K81:180)
250+
WP Insert break:C1413($range; wk paragraph break:K81:259; wk append:K81:179; wk include in range:K81:180)
251251
Else
252252
WP SET TEXT:C1574($range; " "; wk append:K81:179; wk include in range:K81:180)
253253
End if
@@ -554,10 +554,10 @@ Function formulaInsert($insert : Object) //$json : Text)
554554

555555
//$insert:=JSON Parse($json)
556556
$range:=WP Selection range:C1340(*; $insert.areaName)
557-
WP INSERT FORMULA:C1703($range; Formula from string:C1601($insert.source; 1); wk replace:K81:177)
557+
WP Insert formula:C1703($range; Formula from string:C1601($insert.source; 1); wk replace:K81:177)
558558

559559
If (Shift down:C543)
560-
WP INSERT BREAK:C1413($range; wk paragraph break:K81:259; wk append:K81:179; wk include in range:K81:180)
560+
WP Insert break:C1413($range; wk paragraph break:K81:259; wk append:K81:179; wk include in range:K81:180)
561561
Else
562562
WP SET TEXT:C1574($range; " "; wk append:K81:179; wk include in range:K81:180)
563563
End if
@@ -739,7 +739,7 @@ Function templateUI($action : Text)
739739
OBJECT SET ENABLED:C1123(*; $item; $enterable)
740740
End for each
741741

742-
OBJECT SET TITLE:C194(*; "cb_horizontalRuler"; Get action info:C1442("visibleHorizontalRuler").title)
742+
OBJECT SET TITLE:C194(*; "cb_horizontalRuler"; Action info:C1442("visibleHorizontalRuler").title)
743743

744744

745745
Function themeGetList()->$collection : Collection
@@ -1472,17 +1472,17 @@ Function themeUI()
14721472
Function themeGetFontFamily()->$fontFamilly : Object
14731473

14741474

1475-
C_OBJECT:C1216($o; $wp)
1476-
C_LONGINT:C283($i)
1475+
var $o; $wp : Object
1476+
var $i : Integer
14771477

14781478
ARRAY TEXT:C222($_fontFamily; 0)
14791479
FONT LIST:C460($_fontFamily) // no enough for japaneese! check below
1480-
$o:=Get system info:C1571
1480+
$o:=System info:C1571
14811481
If ($o.osLanguage="ja")
14821482
$wp:=WP New:C1317
14831483
For ($i; 1; Size of array:C274($_fontFamily))
14841484
WP SET ATTRIBUTES:C1342($wp; wk font family:K81:65; $_fontFamily{$i})
1485-
WP GET ATTRIBUTES:C1345($wp; wk font family:K81:65; $_fontFamily{$i})
1485+
WP Get attributes:C1345($wp; wk font family:K81:65; $_fontFamily{$i})
14861486
End for
14871487
End if
14881488

@@ -1661,7 +1661,7 @@ Function WP_BuildTable()->$area : Object
16611661
: ($description="header@")
16621662

16631663
If ($previousContent#Null:C1517)
1664-
WP INSERT DOCUMENT:C1411($range; $previousContent; wk replace:K81:177)
1664+
WP Insert document body:C1411($range; $previousContent; wk replace:K81:177)
16651665
Else
16661666
If ($description="header1") // 1st header row has default value (title)
16671667
$insertedText:=Form:C1466.wizard.translate("attribute"; Form:C1466.template.columns[$i].header; True:C214)
@@ -1672,9 +1672,9 @@ Function WP_BuildTable()->$area : Object
16721672
: ($description="data") // Data
16731673

16741674
If ($previousContent#Null:C1517)
1675-
WP INSERT DOCUMENT:C1411($range; $previousContent; wk replace:K81:177)
1675+
WP Insert document body:C1411($range; $previousContent; wk replace:K81:177)
16761676
Else
1677-
WP INSERT FORMULA:C1703($range; Formula from string:C1601(Form:C1466.template.columns[$i].source; 1); wk replace:K81:177) // ∆∆∆ Feature 125
1677+
WP Insert formula:C1703($range; Formula from string:C1601(Form:C1466.template.columns[$i].source; 1); wk replace:K81:177) // ∆∆∆ Feature 125
16781678
End if
16791679

16801680
: ($description="break@") // break
@@ -1683,23 +1683,23 @@ Function WP_BuildTable()->$area : Object
16831683
WP SET ATTRIBUTES:C1342($row; "breakFormula"; Formula from string:C1601(Form:C1466.template.breaks[$id].source; 1)) //wk break formula // ∆∆∆ Feature 125
16841684

16851685
If ($previousContent#Null:C1517)
1686-
WP INSERT DOCUMENT:C1411($range; $previousContent; wk replace:K81:177)
1686+
WP Insert document body:C1411($range; $previousContent; wk replace:K81:177)
16871687
End if
16881688

16891689

16901690
: ($description="bcor") // bottom carry over row
16911691
If ($previousContent#Null:C1517)
1692-
WP INSERT DOCUMENT:C1411($range; $previousContent; wk replace:K81:177)
1692+
WP Insert document body:C1411($range; $previousContent; wk replace:K81:177)
16931693
End if
16941694

16951695
: ($description="extra@") // extra rows
16961696
If ($previousContent#Null:C1517)
1697-
WP INSERT DOCUMENT:C1411($range; $previousContent; wk replace:K81:177)
1697+
WP Insert document body:C1411($range; $previousContent; wk replace:K81:177)
16981698
End if
16991699

17001700
: ($description="placeholder") // placeholder
17011701
If ($previousContent#Null:C1517)
1702-
WP INSERT DOCUMENT:C1411($range; $previousContent; wk replace:K81:177)
1702+
WP Insert document body:C1411($range; $previousContent; wk replace:K81:177)
17031703
End if
17041704

17051705
End case
@@ -1937,16 +1937,16 @@ Function WP_GetMaxTableWidth->$width : Integer
19371937
Else
19381938

19391939
$document:=Form:C1466.range.owner
1940-
WP GET ATTRIBUTES:C1345($document; wk layout unit:K81:78; $unit) // memo unit
1940+
WP Get attributes:C1345($document; wk layout unit:K81:78; $unit) // memo unit
19411941

19421942
WP SET ATTRIBUTES:C1342($document; wk layout unit:K81:78; wk unit pt:K81:136)
19431943
$section:=WP Get section:C1581(Form:C1466.range)
19441944

1945-
WP GET ATTRIBUTES:C1345($section; wk page orientation:K81:264; $orientation)
1945+
WP Get attributes:C1345($section; wk page orientation:K81:264; $orientation)
19461946
If ($orientation=0) // portrait
1947-
WP GET ATTRIBUTES:C1345($document; wk page width:K81:262; $width; wk page margin left:K81:266; $left; wk page margin right:K81:267; $right)
1947+
WP Get attributes:C1345($document; wk page width:K81:262; $width; wk page margin left:K81:266; $left; wk page margin right:K81:267; $right)
19481948
Else // landscape
1949-
WP GET ATTRIBUTES:C1345($document; wk page height:K81:263; $width; wk page margin left:K81:266; $left; wk page margin right:K81:267; $right)
1949+
WP Get attributes:C1345($document; wk page height:K81:263; $width; wk page margin left:K81:266; $left; wk page margin right:K81:267; $right)
19501950
End if
19511951
$width:=$width-$left-$right
19521952

@@ -1996,13 +1996,13 @@ Function JSONvalidate($type : Text; $files : Collection)->$result : Boolean
19961996
$alert:=""
19971997
$tempObject:=JSON Parse:C1218($file.getText())
19981998
If (ok=0)
1999-
$alert:=Get localized string:C991("JSONparseError")
1999+
$alert:=Localized string:C991("JSONparseError")
20002000
$files.remove($i; 1)
20012001
Else
20022002
$parsing:=JSON Validate:C1456($tempObject; $schema)
20032003

20042004
If (Not:C34($parsing.success))
2005-
$alert:=Get localized string:C991("JSONvalidationError")
2005+
$alert:=Localized string:C991("JSONvalidationError")
20062006
$files.remove($i; 1)
20072007
End if
20082008
End if

0 commit comments

Comments
 (0)