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
cf2159cd
Commit
cf2159cd
authored
Aug 24, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Plain Diff
Merge commit '
50f47cae
' into develop
parents
8df6286e
50f47cae
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
Common/DocxFormat/Source/DocxFormat/ContentTypes.h
Common/DocxFormat/Source/DocxFormat/ContentTypes.h
+4
-2
No files found.
Common/DocxFormat/Source/DocxFormat/ContentTypes.h
View file @
cf2159cd
...
@@ -324,9 +324,11 @@ namespace OOX
...
@@ -324,9 +324,11 @@ namespace OOX
{
{
if
(
sExtension
.
empty
())
return
;
if
(
sExtension
.
empty
())
return
;
if
(
m_mapDefaults
.
find
(
sExtension
)
==
m_mapDefaults
.
end
())
std
::
wstring
sExt
=
XmlUtils
::
GetLower
(
sExtension
);
if
(
m_mapDefaults
.
find
(
sExt
)
==
m_mapDefaults
.
end
())
{
{
m_mapDefaults
[
sExt
ension
]
=
ContentTypes
::
CDefault
(
sExtension
);
m_mapDefaults
[
sExt
]
=
ContentTypes
::
CDefault
(
sExt
);
}
}
}
}
private:
private:
...
...
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