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
6f2eef11
Commit
6f2eef11
authored
Feb 17, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
..
parent
9a8d3edb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
ASCOfficePPTXFile/PPTXFormat/FileContainer.cpp
ASCOfficePPTXFile/PPTXFormat/FileContainer.cpp
+2
-2
X2tConverter/src/cextracttools.cpp
X2tConverter/src/cextracttools.cpp
+5
-3
No files found.
ASCOfficePPTXFile/PPTXFormat/FileContainer.cpp
View file @
6f2eef11
...
...
@@ -73,9 +73,9 @@ namespace PPTX
{
directory
=
directory
.
substr
(
0
,
pos_ppt
-
1
);
//root directory
}
CArray
<
std
::
wstring
>
arrFiles
=
NSDirectory
::
GetFiles
(
directory
,
true
);
std
::
vector
<
std
::
wstring
>
arrFiles
=
NSDirectory
::
GetFiles
(
directory
,
true
);
for
(
int
i
=
0
;
i
<
arrFiles
.
GetCount
();
i
++
)
for
(
size_t
i
=
0
;
i
<
arrFiles
.
size
();
i
++
)
{
if
(
std
::
wstring
::
npos
!=
arrFiles
[
i
].
find
(
filename
))
{
...
...
X2tConverter/src/cextracttools.cpp
View file @
6f2eef11
...
...
@@ -276,10 +276,12 @@ namespace NExtractTools
if
(
NSDirectory
::
Exists
(
sChangesDir
))
{
std
::
vector
<
std
::
wstring
>
aChangesFiles
;
CArray
<
std
::
wstring
>
oArray
;
NSDirectory
::
GetFiles2
(
sChangesDir
,
oArray
,
false
);
std
::
vector
<
std
::
wstring
>
oArray
;
std
::
vector
<
std
::
wstring
>
aFiles
;
for
(
int
i
=
0
;
i
<
oArray
.
GetCount
();
++
i
)
NSDirectory
::
GetFiles2
(
sChangesDir
,
oArray
,
false
);
for
(
size_t
i
=
0
;
i
<
oArray
.
size
();
++
i
)
{
aChangesFiles
.
push_back
(
oArray
[
i
]);
}
...
...
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