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
4b727edd
Commit
4b727edd
authored
Mar 09, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
9d10c4dd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
ASCOfficeOdfFile/src/docx/mediaitems.cpp
ASCOfficeOdfFile/src/docx/mediaitems.cpp
+5
-3
No files found.
ASCOfficeOdfFile/src/docx/mediaitems.cpp
View file @
4b727edd
...
@@ -166,8 +166,7 @@ std::wstring mediaitems::detectImageFileExtension(std::wstring &fileName)
...
@@ -166,8 +166,7 @@ std::wstring mediaitems::detectImageFileExtension(std::wstring &fileName)
std
::
wstring
mediaitems
::
add_or_find
(
const
std
::
wstring
&
href
,
RelsType
type
,
bool
&
isInternal
,
std
::
wstring
&
ref
)
std
::
wstring
mediaitems
::
add_or_find
(
const
std
::
wstring
&
href
,
RelsType
type
,
bool
&
isInternal
,
std
::
wstring
&
ref
)
{
{
bool
isMediaInternal
=
is_internal
(
href
,
odf_packet_
);
bool
isMediaInternal
=
true
;
std
::
wstring
sub_path
=
L"media/"
;
std
::
wstring
sub_path
=
L"media/"
;
std
::
wstring
inputFileName
;
std
::
wstring
inputFileName
;
...
@@ -175,10 +174,13 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
...
@@ -175,10 +174,13 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
{
{
sub_path
=
L"charts/"
;
sub_path
=
L"charts/"
;
}
}
if
(
type
==
typeMsObject
||
type
==
typeOleObject
)
else
if
(
type
==
typeMsObject
||
type
==
typeOleObject
)
{
{
sub_path
=
L"embeddings/"
;
sub_path
=
L"embeddings/"
;
}
}
else
isMediaInternal
=
is_internal
(
href
,
odf_packet_
);
int
number
=
0
;
int
number
=
0
;
if
(
type
==
typeChart
)
number
=
count_charts
+
1
;
if
(
type
==
typeChart
)
number
=
count_charts
+
1
;
...
...
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