Skip to content

Commit d192667

Browse files
committed
- Resolve qax-os#627, improve multi-series line chart compatibility with KingSoft WPS
- Avoid to create duplicate style - Update unit test for the auto filter - Init code scanning alerts
1 parent 9316028 commit d192667

File tree

4 files changed

+83
-6
lines changed

4 files changed

+83
-6
lines changed

.github/workflows/codeql-analysis.yml

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
name: "CodeQL"
7+
8+
on:
9+
push:
10+
branches: [master]
11+
pull_request:
12+
# The branches below must be a subset of the branches above
13+
branches: [master]
14+
schedule:
15+
- cron: '0 6 * * 3'
16+
17+
jobs:
18+
analyze:
19+
name: Analyze
20+
runs-on: ubuntu-latest
21+
22+
strategy:
23+
fail-fast: false
24+
matrix:
25+
# Override automatic language detection by changing the below list
26+
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
27+
language: ['go']
28+
# Learn more...
29+
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
30+
31+
steps:
32+
- name: Checkout repository
33+
uses: actions/checkout@v2
34+
with:
35+
# We must fetch at least the immediate parents so that if this is
36+
# a pull request then we can checkout the head.
37+
fetch-depth: 2
38+
39+
# If this run was triggered by a pull request event, then checkout
40+
# the head of the pull request instead of the merge commit.
41+
- run: git checkout HEAD^2
42+
if: ${{ github.event_name == 'pull_request' }}
43+
44+
# Initializes the CodeQL tools for scanning.
45+
- name: Initialize CodeQL
46+
uses: github/codeql-action/init@v1
47+
with:
48+
languages: ${{ matrix.language }}
49+
# If you wish to specify custom queries, you can do so here or in a config file.
50+
# By default, queries listed here will override any specified in a config file.
51+
# Prefix the list here with "+" to use these queries and those in the config file.
52+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
53+
54+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
55+
# If this step fails, then you should remove it and run the build manually (see below)
56+
- name: Autobuild
57+
uses: github/codeql-action/autobuild@v1
58+
59+
# ℹ️ Command-line programs to run using the OS shell.
60+
# 📚 https://git.io/JvXDl
61+
62+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
63+
# and modify them (or add more) to build your code if your project
64+
# uses a compiled language
65+
66+
#- run: |
67+
# make bootstrap
68+
# make release
69+
70+
- name: Perform CodeQL Analysis
71+
uses: github/codeql-action/analyze@v1

adjust_test.go

+8
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,14 @@ func TestAdjustMergeCells(t *testing.T) {
4949

5050
func TestAdjustAutoFilter(t *testing.T) {
5151
f := NewFile()
52+
assert.NoError(t, f.adjustAutoFilter(&xlsxWorksheet{
53+
SheetData: xlsxSheetData{
54+
Row: []xlsxRow{{Hidden: true, R: 2}},
55+
},
56+
AutoFilter: &xlsxAutoFilter{
57+
Ref: "A1:A3",
58+
},
59+
}, rows, 1, -1))
5260
// testing adjustAutoFilter with illegal cell coordinates.
5361
assert.EqualError(t, f.adjustAutoFilter(&xlsxWorksheet{
5462
AutoFilter: &xlsxAutoFilter{

drawing.go

+3-5
Original file line numberDiff line numberDiff line change
@@ -770,13 +770,11 @@ func (f *File) drawChartSeriesSpPr(i int, formatSet *formatChart) *cSpPr {
770770
Ln: &aLn{
771771
W: f.ptToEMUs(formatSet.Series[i].Line.Width),
772772
Cap: "rnd", // rnd, sq, flat
773+
SolidFill: &aSolidFill{
774+
SchemeClr: &aSchemeClr{Val: "accent" + strconv.Itoa((formatSet.order+i)%6+1)},
775+
},
773776
},
774777
}
775-
if i+formatSet.order < 6 {
776-
spPrLine.Ln.SolidFill = &aSolidFill{
777-
SchemeClr: &aSchemeClr{Val: "accent" + strconv.Itoa(i+formatSet.order+1)},
778-
}
779-
}
780778
chartSeriesSpPr := map[string]*cSpPr{Line: spPrLine, Scatter: spPrScatter}
781779
return chartSeriesSpPr[formatSet.Type]
782780
}

styles.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2063,7 +2063,7 @@ var getXfIDFuncs = map[string]func(int, xlsxXf, *Style) bool{
20632063
if style.Alignment == nil {
20642064
return xf.ApplyAlignment == nil || *xf.ApplyAlignment == false
20652065
}
2066-
return reflect.DeepEqual(xf.Alignment, newAlignment(style)) && xf.ApplyBorder != nil && *xf.ApplyBorder == true
2066+
return reflect.DeepEqual(xf.Alignment, newAlignment(style))
20672067
},
20682068
"protection": func(ID int, xf xlsxXf, style *Style) bool {
20692069
if style.Protection == nil {

0 commit comments

Comments
 (0)