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
82b0f4bc
Commit
82b0f4bc
authored
Jan 31, 2017
by
konovalovsergey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DiagramDrawing losing images
parent
56352392
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
0 deletions
+9
-0
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
+3
-0
Common/DocxFormat/Source/DocxFormat/Diagram/DiagramDrawing.h
Common/DocxFormat/Source/DocxFormat/Diagram/DiagramDrawing.h
+6
-0
No files found.
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
View file @
82b0f4bc
...
...
@@ -1744,6 +1744,9 @@ void CDrawingConverter::doc_LoadDiagram(PPTX::Logic::SpTreeElem *result, XmlUtil
if
(
pDiagramDrawing
)
{
result
->
InitElem
(
new
PPTX
::
Logic
::
SpTree
(
*
pDiagramDrawing
->
m_oShapeTree
));
//to correct write blipFill rId to binary
m_strCurrentRelsPath
=
pDiagramDrawing
->
GetReadPath
().
GetPath
();
SetCurrentRelsPath
();
}
else
{
//BG-FSC1.docx
...
...
Common/DocxFormat/Source/DocxFormat/Diagram/DiagramDrawing.h
View file @
82b0f4bc
...
...
@@ -213,6 +213,7 @@ namespace OOX
}
virtual
void
read
(
const
CPath
&
oRootPath
,
const
CPath
&
oFilePath
)
{
m_oReadPath
=
oFilePath
;
IFileContainer
::
Read
(
oRootPath
,
oFilePath
);
//#ifdef USE_LITE_READER
...
...
@@ -259,7 +260,12 @@ namespace OOX
{
return
type
().
DefaultFileName
();
}
const
CPath
&
GetReadPath
()
{
return
m_oReadPath
;
}
CPath
m_oReadPath
;
NSCommon
::
nullable
<
PPTX
::
Logic
::
SpTree
>
m_oShapeTree
;
};
...
...
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