790. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2/1/2017 2:57:07 PM Eastern Standard Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

790.1 Files compared

# Location File Last Modified
1 C:\Araxis_Merge_Comprasion\Pub_un\BTSSS_CIF_122016.zip\BTSSS_CIF_12_20_16\clean\CRM\trunk\SDK\Schemas RibbonCore.xsd Tue Dec 20 19:50:59 2016 UTC
2 Wed Feb 1 19:57:07 2017 UTC

790.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 0 0
Changed 0 0
Inserted 0 0
Removed 1 105

790.3 Comparison options

Whitespace
Character case Differences in character case are significant
Line endings Differences in line endings (CR and LF characters) are ignored
CR/LF characters Not shown in the comparison detail

790.4 Active regular expressions

No regular expressions were active.

790.5 Comparison detail

1   <?xml vers ion="1.0"  encoding=" utf-8"?>        
2   <xs:schema  id="CrmRi bbonCore"  xmlns:xs=" http://www .w3.org/20 01/XMLSche ma">        
3           <x s:include  schemaLoca tion="Ribb onTypes.xs d" />        
4           <x s:include  schemaLoca tion="Ribb onWSS.xsd"  />        
5          
6           <! -- Root El ement-->        
7           <x s:element  name="Ribb onDiffXml"  type="Rib bonGlobalD iffXmlType " />        
8           <x s:element  name="Comm andDefinit ions" type ="CommandD efinitions Type" />        
9           <x s:element  name="Rule Definition s" type="R uleDefinit ionsGlobal Type" />        
10           <x s:element  name="Temp lates" typ e="Templat esType" />        
11           <x s:element  name="Cust omActions"  type="Cus tomActions Type" />        
12          
13           <x s:element  name="UI"  type="Comm andUIType" >        
14           </ xs:element >        
15                   
16           <! -- Element  Types -->        
17           <x s:complexT ype name=" RibbonEnti tyDiffXmlT ype">        
18                    <xs: choice min Occurs="1"  maxOccurs ="1">        
19                             <xs:se quence>        
20                                      <xs:elem ent name=" CustomActi ons" minOc curs="0" m axOccurs=" 1" type="C ustomActio nsType" />        
21                                      <xs:elem ent name=" Templates"  type="Tem platesType " minOccur s="0" maxO ccurs="1"  />        
22                                      <xs:elem ent name=" CommandDef initions"  minOccurs= "0" maxOcc urs="1" ty pe="Comman dDefinitio nsType" />        
23                                      <xs:elem ent name=" RuleDefini tions" min Occurs="0"  maxOccurs ="1" type= "RuleDefin itionsEnti tyType" />        
24                                      <xs:elem ent name=" LocLabels"  minOccurs ="0" maxOc curs="1" t ype="Ribbo nLocLabels Type" />        
25                             </xs:s equence>        
26                             <xs:se quence>        
27                                      <xs:elem ent name=" RibbonNotS upported"  minOccurs= "1" maxOcc urs="1">        
28                                               <xs:comple xType>        
29                                                       <x s:sequence  />        
30                                               </xs:compl exType>        
31                                      </xs:ele ment>        
32                             </xs:s equence>        
33                    </xs :choice>        
34           </ xs:complex Type>        
35          
36           <x s:complexT ype name=" RibbonGlob alDiffXmlT ype">        
37                    <xs: sequence>        
38                             <xs:el ement name ="CustomAc tions" min Occurs="0"  maxOccurs ="1" type= "CustomAct ionsType"  />        
39                             <xs:el ement name ="Template s" type="T emplatesTy pe" minOcc urs="0" ma xOccurs="1 " />        
40                             <xs:el ement name ="CommandD efinitions " minOccur s="0" maxO ccurs="1"  type="Comm andDefinit ionsType"  />        
41                             <xs:el ement name ="RuleDefi nitions" m inOccurs=" 0" maxOccu rs="1" typ e="RuleDef initionsGl obalType"  />        
42                             <xs:el ement name ="LocLabel s" minOccu rs="0" max Occurs="1"  type="Rib bonLocLabe lsType" />        
43                    </xs :sequence>        
44           </ xs:complex Type>        
45          
46           <x s:complexT ype name=" CustomActi onsType">        
47                    <xs: choice min Occurs="0"  maxOccurs ="unbounde d">        
48                             <xs:el ement name ="CustomAc tion" type ="CustomAc tionType"  />        
49                             <xs:el ement name ="HideCust omAction"  type="Hide CustomActi onType" />        
50                    </xs :choice>        
51           </ xs:complex Type>        
52          
53           <x s:complexT ype name=" CustomActi onType">        
54                    <xs: sequence>        
55                             <xs:el ement name ="CommandU IDefinitio n" minOccu rs="1" max Occurs="1" >        
56                                      <xs:comp lexType>        
57                                               <xs:choice >        
58                                                       <x s:element  name="Butt on" type=" ButtonType " />        
59                                                       <x s:element  name="Chec kBox" type ="CheckBox Type" />        
60                                                       <x s:element  name="Comb oBox" type ="ComboBox Type" />        
61                                                       <x s:element  name="Colo rPicker" t ype="Color PickerType " />        
62                                                       <x s:element  name="Cont extualGrou p" type="C ontextualG roupType"  />        
63                                                       <! -- <xs:ele ment name= "Contextua lTabs" typ e="Context ualTabsTyp e" /> -->        
64                                                       <x s:element  name="Cont rols" type ="Controls Type" />        
65                                                       <x s:element  name="Drop Down" type ="DropDown Type" />        
66                                                       <x s:element  name="Flyo utAnchor"  type="Flyo utAnchorTy pe" />        
67                                                       <x s:element  name="Gall ery" type= "GalleryTy pe" />        
68                                                       <x s:element  name="Gall eryButton"  type="Gal leryButton Type" />        
69                                                       <x s:element  name="Grou pTemplate"  type="Gro upTemplate Type" />        
70                                                       <x s:element  name="Grou p" type="G roupType"  />        
71                                                       <x s:element  name="Grou ps" type=" GroupsType " />        
72                                                       <x s:element  name="Inse rtTable" t ype="Inser tTableType " />        
73                                                       <! -- <xs:ele ment name= "Jewel" ty pe="JewelT ype" /> -- >        
74                                                       <x s:element  name="Labe l" type="L abelType"  />        
75                                                       <x s:element  name="MRUS plitButton " type="MR USplitButt onType" />        
76                                                       <x s:element  name="MaxS ize" type= "MaxSizeTy pe" />        
77                                                       <x s:element  name="Menu " type="Me nuType" />        
78                                                       <x s:element  name="Menu Section" t ype="MenuS ectionType " />        
79                                                       <! -- <xs:ele ment name= "QAT" type ="QATType"  /> -->        
80                                                       <! -- <xs:ele ment name= "Ribbon" t ype="Ribbo nType" />  -->        
81                                                       <x s:element  name="Scal e" type="S caleType"  />        
82                                                       <x s:element  name="Scal ing" type= "ScalingTy pe" />        
83                                                       <x s:element  name="Spin ner" type= "SpinnerTy pe" />        
84                                                       <x s:element  name="Spli tButton" t ype="Split ButtonType " />        
85                                                       <x s:element  name="Tab"  type="Tab Type" />        
86                                                       <! -- <xs:ele ment name= "Tabs" typ e="TabsTyp e" /> -->        
87                                                       <x s:element  name="Text Box" type= "TextBoxTy pe" />        
88                                                       <x s:element  name="Togg leButton"  type="Togg leButtonTy pe" />        
89                                               </xs:choic e>        
90                                      </xs:com plexType>        
91                             </xs:e lement>        
92                    </xs :sequence>        
93                    <xs: attribute  name="Id"  type="xs:s tring" />        
94                    <xs: attribute  name="Loca tion" type ="xs:strin g" />        
95                    <xs: attribute  name="Sequ ence" type ="xs:int"  />        
96                    <xs: attribute  name="Titl e" type="x s:string"  />        
97           </ xs:complex Type>        
98          
99           <x s:complexT ype name=" HideCustom ActionType ">        
100                    <xs: attribute  name="Hide ActionId"  type="xs:s tring" />        
101                    <xs: attribute  name="Loca tion" type ="xs:strin g" />        
102                    <xs: attribute  name="Sequ ence" type ="xs:int"  />        
103                    <xs: attribute  name="Titl e" type="x s:string"  />        
104           </ xs:complex Type>        
105   </xs:schem a>