Merge branch 'fix-only-first-line-formated'

elvirbrk · elvirbrk · commit 184328ec059d · 2018-01-25T09:54:32.000+01:00
diff --git a/NoteHighlightAddin/AddIn.cs b/NoteHighlightAddin/AddIn.cs
@@ -399,10 +399,13 @@ private bool IsSelectedTextInline(string pageID)
                 System.Collections.Generic.IEnumerable<XElement> attrPos;
                 if (table == null)
                 {
-                    if (node.Descendants(ns + "T").Where(n => n.Attribute("selected") != null && n.Attribute("selected").Value == "all").Count() > 0
-                        && node.Descendants(ns + "T").Where(n => n.Attribute("selected") == null || n.Attribute("selected").Value == "none").Count() > 0)
+                    foreach (var oeNode in node.Descendants(ns + "OE"))
                     {
-                        return true;
+                        if (oeNode.Descendants(ns + "T").Where(n => n.Attribute("selected") != null && n.Attribute("selected").Value == "all").Count() > 0
+                                        && oeNode.Descendants(ns + "T").Where(n => n.Attribute("selected") == null || n.Attribute("selected").Value == "none").Count() > 0)
+                        {
+                            return true;
+                        } 
                     }
                 }
             }
diff --git a/NoteHighlightAddin/Properties/AssemblyInfo.cs b/NoteHighlightAddin/Properties/AssemblyInfo.cs
@@ -33,5 +33,5 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.3.*")]
-[assembly: AssemblyFileVersion("3.3.*")]
+[assembly: AssemblyVersion("3.4.*")]
+[assembly: AssemblyFileVersion("3.4.*")]
diff --git a/Setup/Setup.vdproj b/Setup/Setup.vdproj
@@ -58,13 +58,19 @@
         "Entry"
         {
         "MsmKey" = "8:_805E0317B9E0B1539EEBB800C533393B"
-        "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4"
+        "OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_805E0317B9E0B1539EEBB800C533393B"
-        "OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B"
+        "OwnerKey" = "8:_7CBDA023CD2F435BB8D4D5586B86D83B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_805E0317B9E0B1539EEBB800C533393B"
+        "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -106,37 +112,37 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4"
+        "OwnerKey" = "8:_CBF51C0C38434D629FC3271C5390E247"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_5F7DADAECA95B8A8EECB662A9FCF5BB5"
+        "OwnerKey" = "8:_BF0DDD11259532587F856D651F450ECC"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_E4014126696E456F7FC66801CBFEEE19"
+        "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B"
+        "OwnerKey" = "8:_5F7DADAECA95B8A8EECB662A9FCF5BB5"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_CBF51C0C38434D629FC3271C5390E247"
+        "OwnerKey" = "8:_E4014126696E456F7FC66801CBFEEE19"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_BF0DDD11259532587F856D651F450ECC"
+        "OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -640,15 +646,15 @@
         {
         "Name" = "8:NoteHighlightAddin"
         "ProductName" = "8:NoteHighlight2016"
-        "ProductCode" = "8:{06C54F51-8380-4D3D-AE57-EAD216E77D21}"
-        "PackageCode" = "8:{D22D282E-F62C-4580-8BEF-6BE25658DFAD}"
+        "ProductCode" = "8:{133D55D9-8F9D-4BED-AF25-A68497D0F17E}"
+        "PackageCode" = "8:{494C0099-A126-4241-8398-DB234B5182E6}"
         "UpgradeCode" = "8:{0025873C-20C5-48D6-A93A-FBD3891A9233}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:3.3"
+        "ProductVersion" = "8:3.4"
         "Manufacturer" = "8:CodingRoad"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
diff --git a/SetupX86/SetupX86.vdproj b/SetupX86/SetupX86.vdproj
@@ -58,13 +58,19 @@
         "Entry"
         {
         "MsmKey" = "8:_805E0317B9E0B1539EEBB800C533393B"
-        "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4"
+        "OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_805E0317B9E0B1539EEBB800C533393B"
-        "OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B"
+        "OwnerKey" = "8:_7CBDA023CD2F435BB8D4D5586B86D83B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_805E0317B9E0B1539EEBB800C533393B"
+        "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -106,37 +112,37 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4"
+        "OwnerKey" = "8:_CBF51C0C38434D629FC3271C5390E247"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_5F7DADAECA95B8A8EECB662A9FCF5BB5"
+        "OwnerKey" = "8:_BF0DDD11259532587F856D651F450ECC"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_E4014126696E456F7FC66801CBFEEE19"
+        "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B"
+        "OwnerKey" = "8:_5F7DADAECA95B8A8EECB662A9FCF5BB5"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_CBF51C0C38434D629FC3271C5390E247"
+        "OwnerKey" = "8:_E4014126696E456F7FC66801CBFEEE19"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_BF0DDD11259532587F856D651F450ECC"
+        "OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -640,15 +646,15 @@
         {
         "Name" = "8:NoteHighlightAddin"
         "ProductName" = "8:NoteHighlight2016"
-        "ProductCode" = "8:{A96824F2-F745-4DA2-8E5C-394ABF16D621}"
-        "PackageCode" = "8:{FE83A89B-5FDA-4A20-AE0A-A95CD283337D}"
+        "ProductCode" = "8:{71D5863E-7AA9-4848-8D62-C6EE49AFE066}"
+        "PackageCode" = "8:{E506D87B-E13B-42D6-81F5-6C6A2B980CE4}"
         "UpgradeCode" = "8:{0025873C-20C5-48D6-A93A-FBD3891A9233}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:3.3"
+        "ProductVersion" = "8:3.4"
         "Manufacturer" = "8:CodingRoad"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"

Original file line number	Diff line number	Diff line change
`@@ -399,10 +399,13 @@ private bool IsSelectedTextInline(string pageID)`
`399`	`399`	`System.Collections.Generic.IEnumerable<XElement> attrPos;`
`400`	`400`	`if (table == null)`
`401`	`401`	`{`
`402`		`- if (node.Descendants(ns + "T").Where(n => n.Attribute("selected") != null && n.Attribute("selected").Value == "all").Count() > 0`
`403`		`- && node.Descendants(ns + "T").Where(n => n.Attribute("selected") == null \|\| n.Attribute("selected").Value == "none").Count() > 0)`
	`402`	`+ foreach (var oeNode in node.Descendants(ns + "OE"))`
`404`	`403`	`{`
`405`		`- return true;`
	`404`	`+ if (oeNode.Descendants(ns + "T").Where(n => n.Attribute("selected") != null && n.Attribute("selected").Value == "all").Count() > 0`
	`405`	`+ && oeNode.Descendants(ns + "T").Where(n => n.Attribute("selected") == null \|\| n.Attribute("selected").Value == "none").Count() > 0)`
	`406`	`+ {`
	`407`	`+ return true;`
	`408`	`+ }`
`406`	`409`	`}`
`407`	`410`	`}`
`408`	`411`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,13 +58,19 @@`
`58`	`58`	`"Entry"`
`59`	`59`	`{`
`60`	`60`	`"MsmKey" = "8:_805E0317B9E0B1539EEBB800C533393B"`
`61`		`- "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4"`
	`61`	`+ "OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B"`
`62`	`62`	`"MsmSig" = "8:_UNDEFINED"`
`63`	`63`	`}`
`64`	`64`	`"Entry"`
`65`	`65`	`{`
`66`	`66`	`"MsmKey" = "8:_805E0317B9E0B1539EEBB800C533393B"`
`67`		`- "OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B"`
	`67`	`+ "OwnerKey" = "8:_7CBDA023CD2F435BB8D4D5586B86D83B"`
	`68`	`+ "MsmSig" = "8:_UNDEFINED"`
	`69`	`+ }`
	`70`	`+ "Entry"`
	`71`	`+ {`
	`72`	`+ "MsmKey" = "8:_805E0317B9E0B1539EEBB800C533393B"`
	`73`	`+ "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4"`
`68`	`74`	`"MsmSig" = "8:_UNDEFINED"`
`69`	`75`	`}`
`70`	`76`	`"Entry"`
`@@ -106,37 +112,37 @@`
`106`	`112`	`"Entry"`
`107`	`113`	`{`
`108`	`114`	`"MsmKey" = "8:_UNDEFINED"`
`109`		`- "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4"`
	`115`	`+ "OwnerKey" = "8:_CBF51C0C38434D629FC3271C5390E247"`
`110`	`116`	`"MsmSig" = "8:_UNDEFINED"`
`111`	`117`	`}`
`112`	`118`	`"Entry"`
`113`	`119`	`{`
`114`	`120`	`"MsmKey" = "8:_UNDEFINED"`
`115`		`- "OwnerKey" = "8:_5F7DADAECA95B8A8EECB662A9FCF5BB5"`
	`121`	`+ "OwnerKey" = "8:_BF0DDD11259532587F856D651F450ECC"`
`116`	`122`	`"MsmSig" = "8:_UNDEFINED"`
`117`	`123`	`}`
`118`	`124`	`"Entry"`
`119`	`125`	`{`
`120`	`126`	`"MsmKey" = "8:_UNDEFINED"`
`121`		`- "OwnerKey" = "8:_E4014126696E456F7FC66801CBFEEE19"`
	`127`	`+ "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4"`
`122`	`128`	`"MsmSig" = "8:_UNDEFINED"`
`123`	`129`	`}`
`124`	`130`	`"Entry"`
`125`	`131`	`{`
`126`	`132`	`"MsmKey" = "8:_UNDEFINED"`
`127`		`- "OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B"`
	`133`	`+ "OwnerKey" = "8:_5F7DADAECA95B8A8EECB662A9FCF5BB5"`
`128`	`134`	`"MsmSig" = "8:_UNDEFINED"`
`129`	`135`	`}`
`130`	`136`	`"Entry"`
`131`	`137`	`{`
`132`	`138`	`"MsmKey" = "8:_UNDEFINED"`
`133`		`- "OwnerKey" = "8:_CBF51C0C38434D629FC3271C5390E247"`
	`139`	`+ "OwnerKey" = "8:_E4014126696E456F7FC66801CBFEEE19"`
`134`	`140`	`"MsmSig" = "8:_UNDEFINED"`
`135`	`141`	`}`
`136`	`142`	`"Entry"`
`137`	`143`	`{`
`138`	`144`	`"MsmKey" = "8:_UNDEFINED"`
`139`		`- "OwnerKey" = "8:_BF0DDD11259532587F856D651F450ECC"`
	`145`	`+ "OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B"`
`140`	`146`	`"MsmSig" = "8:_UNDEFINED"`
`141`	`147`	`}`
`142`	`148`	`"Entry"`
`@@ -640,15 +646,15 @@`
`640`	`646`	`{`
`641`	`647`	`"Name" = "8:NoteHighlightAddin"`
`642`	`648`	`"ProductName" = "8:NoteHighlight2016"`
`643`		`- "ProductCode" = "8:{06C54F51-8380-4D3D-AE57-EAD216E77D21}"`
`644`		`- "PackageCode" = "8:{D22D282E-F62C-4580-8BEF-6BE25658DFAD}"`
	`649`	`+ "ProductCode" = "8:{133D55D9-8F9D-4BED-AF25-A68497D0F17E}"`
	`650`	`+ "PackageCode" = "8:{494C0099-A126-4241-8398-DB234B5182E6}"`
`645`	`651`	`"UpgradeCode" = "8:{0025873C-20C5-48D6-A93A-FBD3891A9233}"`
`646`	`652`	`"AspNetVersion" = "8:4.0.30319.0"`
`647`	`653`	`"RestartWWWService" = "11:FALSE"`
`648`	`654`	`"RemovePreviousVersions" = "11:TRUE"`
`649`	`655`	`"DetectNewerInstalledVersion" = "11:TRUE"`
`650`	`656`	`"InstallAllUsers" = "11:TRUE"`
`651`		`- "ProductVersion" = "8:3.3"`
	`657`	`+ "ProductVersion" = "8:3.4"`
`652`	`658`	`"Manufacturer" = "8:CodingRoad"`
`653`	`659`	`"ARPHELPTELEPHONE" = "8:"`
`654`	`660`	`"ARPHELPLINK" = "8:"`