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
048fbc4b
Commit
048fbc4b
authored
Aug 21, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix users file
parent
0296a6ef
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
6 deletions
+11
-6
ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp
ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp
+11
-6
No files found.
ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp
View file @
048fbc4b
...
@@ -166,23 +166,28 @@ namespace PPTX
...
@@ -166,23 +166,28 @@ namespace PPTX
pWriter
->
WriteBYTE
(
1
);
pWriter
->
WriteBYTE
(
1
);
pWriter
->
EndRecord
();
pWriter
->
EndRecord
();
DocWrapper
::
FontProcessor
fp
;
DocWrapper
::
FontProcessor
oFontProcessor
;
NSBinPptxRW
::
CDrawingConverter
oDrawingConverter
;
NSBinPptxRW
::
CDrawingConverter
oDrawingConverter
;
BinDocxRW
::
CDocxSerializer
oDocxSerializer
;
NSBinPptxRW
::
CBinaryFileWriter
*
old_writer
=
oDrawingConverter
.
m_pBinaryWriter
;
NSBinPptxRW
::
CBinaryFileWriter
*
old_writer
=
oDrawingConverter
.
m_pBinaryWriter
;
NSCommon
::
smart_ptr
<
OOX
::
IFileContainer
>
old_rels
=
*
pWriter
->
m_pCurrentContainer
;
NSCommon
::
smart_ptr
<
OOX
::
IFileContainer
>
old_rels
=
*
pWriter
->
m_pCurrentContainer
;
BinDocxRW
::
CDocxSerializer
*
old_serial
=
pWriter
->
m_pMainDocument
;
oDrawingConverter
.
m_pBinaryWriter
=
pWriter
;
oDrawingConverter
.
m_pBinaryWriter
=
pWriter
;
oDocxSerializer
.
m_pParamsWriter
=
new
BinDocxRW
::
ParamsWriter
(
pWriter
,
&
oFontProcessor
,
&
oDrawingConverter
,
NULL
);
BinDocxRW
::
ParamsWriter
oParamsWriter
(
pWriter
,
&
fp
,
&
oDrawingConverter
,
NULL
);
pWriter
->
m_pMainDocument
=
&
oDocxSerializer
;
BinDocxRW
::
BinaryFileWriter
oBinaryFileWriter
(
oParamsWriter
);
BinDocxRW
::
BinaryFileWriter
oBinaryFileWriter
(
*
oDocxSerializer
.
m_pParamsWriter
);
pWriter
->
StartRecord
(
2
);
pWriter
->
StartRecord
(
2
);
oBinaryFileWriter
.
intoBindoc
(
oox_unpacked
.
GetPath
());
oBinaryFileWriter
.
intoBindoc
(
oox_unpacked
.
GetPath
());
pWriter
->
EndRecord
();
pWriter
->
EndRecord
();
oDrawingConverter
.
m_pBinaryWriter
=
old_writer
;
oDrawingConverter
.
m_pBinaryWriter
=
old_writer
;
*
pWriter
->
m_pCurrentContainer
=
old_rels
;
*
pWriter
->
m_pCurrentContainer
=
old_rels
;
pWriter
->
m_pMainDocument
=
old_serial
;
}
}
else
if
(
office_checker
.
nFileType
==
AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX
)
else
if
(
office_checker
.
nFileType
==
AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX
)
//if ( std::wstring::npos != sProgID.find(L"Excel.Sheet")) //"ET.Xlsx.6" !!!
//if ( std::wstring::npos != sProgID.find(L"Excel.Sheet")) //"ET.Xlsx.6" !!!
...
...
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