Resolve UO-27, UO-28, UO-31 (unidoc#407)

* Fixes in CI (unidoc#406)

* Create .gitattributes

* Update .travis.yml

* Update .travis.yml

* travis fix

* only errors are printed in travis log

* spreadsheet errors fixed: duplicate ID in non-visual properties and lack of third axis in an example

* set-strict example fix

* build-examples.sh exits with error status in the case of build error

* redundant command deleted from script

* unneeded image relationships removed

* pptx validation errors fixes

* all output to travis

Co-authored-by: Gunnsteinn Hall <[email protected]>

.travis/dotnet_run.sh

@@ -1,7 +1,10 @@
 #!/bin/bash
 output=$(dotnet ./openxml-validator/bin/Debug/netcoreapp3.0/Program.dll --$2 $1)
+echo $output
+echo ""
 if [[ $output == *"is not valid"* ]]; then
-	if [[ $output != *"main:sz"* ]] && [[ $output != *"main:family"* ]]; then
-		>&2 echo $output\\n
+	if [[ $output != *"main:sz"* ]] && [[ $output != *"main:family"* ]] && [[ $output != *"Attribute 'si' should be present when the value of attribute 't' is 'shared'"* ]] ; then
+		echo $output >> errors
+		echo "" >> errors
 	fi
 fi

.travis/validate-examples.sh

@@ -1,5 +1,12 @@
+#!/bin/bash
 find ../_examples -maxdepth 2 -mindepth 2 -exec sh -c "cd {}; echo running {}; ./main" \;
 export PATH=$PATH:$HOME/dotnet
+:> errors
 find ../_examples -name "*.docx" $(printf "! -name %s " $(cat skip_files)) -exec ./dotnet_run.sh {} docx \;
 find ../_examples -name "*.xlsx" $(printf "! -name %s " $(cat skip_files)) -exec ./dotnet_run.sh {} xlsx \;
 find ../_examples -name "*.pptx" $(printf "! -name %s " $(cat skip_files)) -exec ./dotnet_run.sh {} pptx \;
+if [[ $(wc -l errors) == "0 errors" ]]; then
+	exit 0
+fi
+echo "there are errors"
+exit 1

_examples/document/set-strict/main.go

@@ -4,7 +4,6 @@ package main
 
 import (
 	"github.com/unidoc/unioffice/document"
-	st "github.com/unidoc/unioffice/schema/soo/ofc/sharedTypes"
 )
 
 func main() {

_examples/presentation/use-template-with-image/main.go

@@ -83,7 +83,7 @@ func main() {
 		fmt.Println("ppt.Validate err ", err)
 	}
 
-	if err := ppt.SaveToFile("success.pptx"); err != nil {
+	if err := ppt.SaveToFile("mod.pptx"); err != nil {
 		fmt.Println("ppt.SaveToFile err ", err)
 	}
 

_examples/spreadsheet/complex/main.go

@@ -137,11 +137,12 @@ func addLineChart(chrt chart.Chart) {
 	totalSeries.SetText("Total")
 	totalSeries.Values().SetReference(`'Sheet 1'!D2:D6`)
 
-	// the line chart accepts up to two axes
+	// the 3d line chart accepts three axes
 	ca := chrt.AddCategoryAxis()
 	va := chrt.AddValueAxis()
 	lc.AddAxis(ca)
 	lc.AddAxis(va)
+	lc.AddAxis(chart.NullAxis)
 
 	ca.SetCrosses(va)
 	va.SetCrosses(ca)

build-examples.sh

@@ -1,4 +1,9 @@
 #!/bin/bash
 
 go get -u github.com/go-ole/go-ole/oleutil
-find _examples/ -maxdepth 2 -mindepth 2 -exec sh -c "cd {}; echo building {}; go build -i main.go" \;
+:> build_errors
+find _examples/ -maxdepth 2 -mindepth 2 -exec sh -c "cd {}; echo building {}; go build -i main.go" 2>>build_errors \;
+if [[ $(wc -l build_errors | awk '{print $1}') == "0" ]]; then
+	exit 0
+fi
+exit 1

presentation/presentation.go

@@ -356,7 +356,9 @@ func (p *Presentation) AddSlideWithLayout(l SlideLayout) (Slide, error) {
 		if lout == l.X() {
 			lrels := p.layoutRels[i]
 			for _, lrel := range lrels.X().Relationship {
-				p.slideRels[slrLen].X().Relationship = append(p.slideRels[slrLen].X().Relationship, lrel)
+				if lrel.TypeAttr != unioffice.SlideMasterType {
+					p.slideRels[slrLen].X().Relationship = append(p.slideRels[slrLen].X().Relationship, lrel)
+				}
 			}
 			srel.AddAutoRelationship(unioffice.DocTypePresentation, unioffice.SlideType,
 				i+1, unioffice.SlideLayoutType)
@@ -851,9 +853,6 @@ func (p *Presentation) AddImage(i common.Image) (common.ImageRef, error) {
 		return r, errors.New("image must have a valid size")
 	}
 
-	fn := fmt.Sprintf("media/image%d.%s", len(p.Images)+1, i.Format)
-	rel := p.prels.AddRelationship(fn, unioffice.ImageType)
-	r.SetRelID(rel.X().IdAttr)
 	p.Images = append(p.Images, r)
 	p.ContentTypes.EnsureDefault("png", "image/png")
 	p.ContentTypes.EnsureDefault("jpeg", "image/jpeg")

schema/soo/dml/CT_ColorMappingOverride.go

@@ -26,7 +26,6 @@ func NewCT_ColorMappingOverride() *CT_ColorMappingOverride {
 }
 
 func (m *CT_ColorMappingOverride) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-	start.Name.Local = "a:CT_ColorMappingOverride"
 	e.EncodeToken(start)
 	m.Choice.MarshalXML(e, xml.StartElement{})
 	e.EncodeToken(xml.EndElement{Name: start.Name})

spreadsheet/drawing.go

@@ -84,7 +84,7 @@ func (d Drawing) AddChart(at AnchorType) (chart.Chart, Anchor) {
 
 	// required by Mac Excel
 	gf.NvGraphicFramePr = sd.NewCT_GraphicalObjectFrameNonVisual()
-	gf.NvGraphicFramePr.CNvPr.IdAttr = 2
+	gf.NvGraphicFramePr.CNvPr.IdAttr = uint32(len(d.x.EG_Anchor))
 	gf.NvGraphicFramePr.CNvPr.NameAttr = "Chart"
 
 	gf.Graphic = dml.NewGraphic()
@@ -149,7 +149,7 @@ func (d Drawing) AddImage(img common.ImageRef, at AnchorType) Anchor {
 		anc = TwoCellAnchor{tca}
 	}
 
-	pic.NvPicPr.CNvPr.IdAttr = 0
+	pic.NvPicPr.CNvPr.IdAttr = uint32(len(d.x.EG_Anchor))
 	pic.NvPicPr.CNvPr.NameAttr = "Image"
 	pic.BlipFill.Blip = dml.NewCT_Blip()
 	pic.BlipFill.Blip.EmbedAttr = unioffice.String(imgID)

spreadsheet/workbook.go

@@ -675,8 +675,6 @@ func (wb *Workbook) AddImage(i common.Image) (common.ImageRef, error) {
 	}
 
 	wb.Images = append(wb.Images, r)
-	fn := fmt.Sprintf("media/image%d.%s", len(wb.Images), i.Format)
-	wb.wbRels.AddRelationship(fn, unioffice.ImageType)
 	return r, nil
 }