Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
onlyoffice_core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
onlyoffice_core
Commits
e59eff3a
Commit
e59eff3a
authored
Dec 18, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix user file
parent
2206b3b3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
ASCOfficeXlsFile2/XlsFormatTest/XlsFormatTest.vcproj
ASCOfficeXlsFile2/XlsFormatTest/XlsFormatTest.vcproj
+1
-1
ASCOfficeXlsFile2/source/XlsFormat/Auxiliary/HelpFunc.cpp
ASCOfficeXlsFile2/source/XlsFormat/Auxiliary/HelpFunc.cpp
+2
-2
No files found.
ASCOfficeXlsFile2/XlsFormatTest/XlsFormatTest.vcproj
View file @
e59eff3a
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
PreprocessorDefinitions=
"WIN32;_DEBUG;_CONSOLE"
PreprocessorDefinitions=
"WIN32;_DEBUG;_CONSOLE"
MinimalRebuild=
"true"
MinimalRebuild=
"true"
BasicRuntimeChecks=
"3"
BasicRuntimeChecks=
"3"
RuntimeLibrary=
"
3
"
RuntimeLibrary=
"
1
"
UsePrecompiledHeader=
"0"
UsePrecompiledHeader=
"0"
ProgramDataBaseFileName=
"$(IntDir)\XlsFileTestD.pdb"
ProgramDataBaseFileName=
"$(IntDir)\XlsFileTestD.pdb"
WarningLevel=
"3"
WarningLevel=
"3"
...
...
ASCOfficeXlsFile2/source/XlsFormat/Auxiliary/HelpFunc.cpp
View file @
e59eff3a
...
@@ -516,7 +516,7 @@ const std::wstring tab2sheet_name(const short tabid, std::vector<std::wstring>&
...
@@ -516,7 +516,7 @@ const std::wstring tab2sheet_name(const short tabid, std::vector<std::wstring>&
const
std
::
wstring
name2sheet_name
(
std
::
wstring
name
,
const
std
::
wstring
prefix
)
const
std
::
wstring
name2sheet_name
(
std
::
wstring
name
,
const
std
::
wstring
prefix
)
{
{
static
boost
::
wregex
correct_sheet_name
(
L"^
\\
'.+?
\\
'$"
);
static
boost
::
wregex
correct_sheet_name
(
L"^
\\
'.+?
\\
'$"
);
static
boost
::
wregex
test_sheet_name
(
L"[
\\
s)(
\\
'&:-]+"
);
//.??? 6442946.xls
static
boost
::
wregex
test_sheet_name
(
L"[
\\
s)(
\\
!
\\
'&:-]+"
);
//.??? 6442946.xls
std
::
wstring
sheet_first
=
prefix
+
name
;
std
::
wstring
sheet_first
=
prefix
+
name
;
...
@@ -537,7 +537,7 @@ const std::wstring xti_indexes2sheet_name(const short tabFirst, const short tabL
...
@@ -537,7 +537,7 @@ const std::wstring xti_indexes2sheet_name(const short tabFirst, const short tabL
return
L"#REF"
;
return
L"#REF"
;
}
}
static
boost
::
wregex
correct_sheet_name
(
L"^
\\
'.+?
\\
'$"
);
static
boost
::
wregex
correct_sheet_name
(
L"^
\\
'.+?
\\
'$"
);
static
boost
::
wregex
test_sheet_name
(
L"[
\\
s)(
\\
'&:-]+"
);
//.??? 6442946.xls
static
boost
::
wregex
test_sheet_name
(
L"[
\\
s)(
\\
!
\\
'&:-]+"
);
//.??? 6442946.xls
std
::
wstring
sheet_first
=
prefix
+
tab2sheet_name
(
tabFirst
,
names
);
std
::
wstring
sheet_first
=
prefix
+
tab2sheet_name
(
tabFirst
,
names
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment