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
d805972d
Commit
d805972d
authored
Jun 05, 2017
by
Alexey Golubev
Committed by
GitHub
Jun 05, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #28 from ONLYOFFICE/hotfix/v4.3.5
Hotfix/v4.3.5
parents
771bf2d5
549d5a46
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
9 deletions
+33
-9
Common/3dParty/cef/fetch.bat
Common/3dParty/cef/fetch.bat
+9
-7
Common/3dParty/icu/fetch.bat
Common/3dParty/icu/fetch.bat
+4
-0
Common/DocxFormat/Source/DocxFormat/FileFactory.cpp
Common/DocxFormat/Source/DocxFormat/FileFactory.cpp
+10
-1
Common/DocxFormat/Source/XlsxFormat/FileFactory_Spreadsheet.cpp
.../DocxFormat/Source/XlsxFormat/FileFactory_Spreadsheet.cpp
+10
-1
No files found.
Common/3dParty/cef/fetch.bat
View file @
d805972d
SET
SCRIPTPATH
=
%~dp0
CD
/D
%~dp0
SET
PLATFORM
=
win
SET
ARCH
=
_32
SET
PLATFORM
=
win_32
if
defined
ProgramFiles
(
x86
)
(
SET
ARCH
=
_64
SET
PLATFORM
=
win_64
)
if
defined
TARGET
(
SET
PLATFORM
=
%TARGET%
)
mkdir
"
%SCRIPTPATH%%
PLATFORM
%
%ARCH%
"
cd
"
%SCRIPTPATH%%
PLATFORM
%
%ARCH%
"
mkdir
"
%SCRIPTPATH%%
PLATFORM
%
"
cd
"
%SCRIPTPATH%%
PLATFORM
%
"
if
exist
"cef_binary.7z"
(
echo
"cef_binary.7z already downloaded"
)
else
(
Powershell
.exe
Invoke
-WebRequest -OutFile
cef_binary
.7z
http
://d2ettrnqo7v976.cloudfront.net/cef/2454/
%PLATFORM%
%
ARCH
%
/cef
_binary.7z
Powershell
.exe
Invoke
-WebRequest -OutFile
cef_binary
.7z
http
://d2ettrnqo7v976.cloudfront.net/cef/2454/
%PLATFORM%
/cef
_binary.7z
)
SET
UNSIP_PROGRAMM
=
"
%ProgramFiles%
\7-Zip\7z.exe"
...
...
Common/3dParty/icu/fetch.bat
View file @
d805972d
...
...
@@ -6,6 +6,10 @@ if defined ProgramFiles(x86) (
SET
platform
=
win_64
)
if
defined
TARGET
(
SET
platform
=
%TARGET%
)
if
not
exist
"
%platform%
"
(
md
"
%platform%
"
)
...
...
Common/DocxFormat/Source/DocxFormat/FileFactory.cpp
View file @
d805972d
...
...
@@ -158,7 +158,16 @@ namespace OOX
else
if
(
pRelation
->
Type
()
==
FileTypes
::
Document
)
return
smart_ptr
<
OOX
::
File
>
(
new
CDocument
(
oRootPath
,
oFileName
));
else
if
(
pRelation
->
Type
()
==
FileTypes
::
Theme
)
return
smart_ptr
<
OOX
::
File
>
(
new
PPTX
::
Theme
(
oFileName
));
{
if
(
NSFile
::
CFileBinary
::
Exists
(
oFileName
.
GetPath
()))
{
return
smart_ptr
<
OOX
::
File
>
(
new
PPTX
::
Theme
(
oFileName
));
}
else
{
return
smart_ptr
<
OOX
::
File
>
(
new
UnknowTypeFile
()
);
}
}
else
if
(
pRelation
->
Type
()
==
FileTypes
::
ThemeOverride
)
return
smart_ptr
<
OOX
::
File
>
(
new
PPTX
::
Theme
(
oFileName
));
else
if
(
pRelation
->
Type
()
==
FileTypes
::
Setting
)
...
...
Common/DocxFormat/Source/XlsxFormat/FileFactory_Spreadsheet.cpp
View file @
d805972d
...
...
@@ -128,7 +128,16 @@ namespace OOX
else
if
(
pRelation
->
Type
()
==
FileTypes
::
Worksheet
)
return
smart_ptr
<
OOX
::
File
>
(
new
CWorksheet
(
oRootPath
,
oFileName
));
else
if
(
pRelation
->
Type
()
==
OOX
::
FileTypes
::
Theme
)
return
smart_ptr
<
OOX
::
File
>
(
new
PPTX
::
Theme
(
oFileName
));
{
if
(
NSFile
::
CFileBinary
::
Exists
(
oFileName
.
GetPath
()))
{
return
smart_ptr
<
OOX
::
File
>
(
new
PPTX
::
Theme
(
oFileName
));
}
else
{
return
smart_ptr
<
OOX
::
File
>
(
new
UnknowTypeFile
()
);
}
}
else
if
(
pRelation
->
Type
()
==
OOX
::
FileTypes
::
ThemeOverride
)
return
smart_ptr
<
OOX
::
File
>
(
new
PPTX
::
Theme
(
oFileName
));
else
if
(
pRelation
->
Type
()
==
FileTypes
::
Drawings
)
...
...
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