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
5a3f98c5
Commit
5a3f98c5
authored
Apr 13, 2017
by
Sergey Konovalov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
open notesMasters rels
parent
8677540a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
1 deletion
+23
-1
ASCOfficePPTXFile/Editor/BinReaderWriterDefines.h
ASCOfficePPTXFile/Editor/BinReaderWriterDefines.h
+2
-1
ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.h
ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.h
+1
-0
ASCOfficePPTXFile/Editor/Converter.h
ASCOfficePPTXFile/Editor/Converter.h
+20
-0
No files found.
ASCOfficePPTXFile/Editor/BinReaderWriterDefines.h
View file @
5a3f98c5
...
@@ -82,7 +82,8 @@ namespace NSBinPptxRW
...
@@ -82,7 +82,8 @@ namespace NSBinPptxRW
FontsEmbedded
=
44
,
FontsEmbedded
=
44
,
SlideNotesRels
=
45
,
SlideNotesRels
=
45
,
NotesRels
=
46
NotesRels
=
46
,
NotesMastersRels
=
47
};
};
}
}
}
}
...
...
ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.h
View file @
5a3f98c5
...
@@ -154,6 +154,7 @@ namespace NSBinPptxRW
...
@@ -154,6 +154,7 @@ namespace NSBinPptxRW
std
::
vector
<
LONG
>
m_oSlide_Layout_Rels
;
std
::
vector
<
LONG
>
m_oSlide_Layout_Rels
;
std
::
vector
<
LONG
>
m_oSlide_Notes_Rels
;
std
::
vector
<
LONG
>
m_oSlide_Notes_Rels
;
std
::
vector
<
LONG
>
m_oNote_Rels
;
std
::
vector
<
LONG
>
m_oNote_Rels
;
std
::
vector
<
LONG
>
m_oNotesMasters_Rels
;
NSShapeImageGen
::
CImageManager
*
m_pImageManager
;
NSShapeImageGen
::
CImageManager
*
m_pImageManager
;
...
...
ASCOfficePPTXFile/Editor/Converter.h
View file @
5a3f98c5
...
@@ -147,13 +147,18 @@ namespace PPTX2EditorAdvanced
...
@@ -147,13 +147,18 @@ namespace PPTX2EditorAdvanced
// проверяем theme
// проверяем theme
size_t
pPointerTh
=
(
size_t
)(
noteMaster
->
theme_
.
operator
->
());
size_t
pPointerTh
=
(
size_t
)(
noteMaster
->
theme_
.
operator
->
());
LONG
nNotesMastersRelsIndex
=
-
1
;
std
::
map
<
size_t
,
LONG
>::
const_iterator
pSearchTh
=
pCommon
->
themes
.
find
(
pPointerTh
);
std
::
map
<
size_t
,
LONG
>::
const_iterator
pSearchTh
=
pCommon
->
themes
.
find
(
pPointerTh
);
if
(
pSearchTh
==
pCommon
->
themes
.
end
())
if
(
pSearchTh
==
pCommon
->
themes
.
end
())
{
{
LONG
lCountTh
=
(
LONG
)
_themes
.
size
();
LONG
lCountTh
=
(
LONG
)
_themes
.
size
();
pCommon
->
themes
[
pPointerTh
]
=
lCountTh
;
pCommon
->
themes
[
pPointerTh
]
=
lCountTh
;
_themes
.
push_back
(
noteMaster
->
theme_
);
_themes
.
push_back
(
noteMaster
->
theme_
);
nNotesMastersRelsIndex
=
lCountTh
;
}
else
{
nNotesMastersRelsIndex
=
pSearchTh
->
second
;
}
}
oBinaryWriter
.
m_pCommon
->
m_oNotesMasters_Rels
.
push_back
(
nNotesMastersRelsIndex
);
}
}
// записываем все слайды
// записываем все слайды
...
@@ -490,6 +495,21 @@ namespace PPTX2EditorAdvanced
...
@@ -490,6 +495,21 @@ namespace PPTX2EditorAdvanced
oBinaryWriter
.
EndRecord
();
oBinaryWriter
.
EndRecord
();
// ------------------------------------------------
// ------------------------------------------------
// NoteRels --------------------------------------
oBinaryWriter
.
StartMainRecord
(
NSMainTables
::
NotesMastersRels
);
oBinaryWriter
.
StartRecord
(
NSMainTables
::
NotesMastersRels
);
oBinaryWriter
.
WriteBYTE
(
NSBinPptxRW
::
g_nodeAttributeStart
);
_s_rels
=
oBinaryWriter
.
m_pCommon
->
m_oNotesMasters_Rels
.
size
();
for
(
size_t
i
=
0
;
i
<
_s_rels
;
++
i
)
{
oBinaryWriter
.
WriteInt1
(
0
,
oBinaryWriter
.
m_pCommon
->
m_oNotesMasters_Rels
[
i
]);
}
oBinaryWriter
.
WriteBYTE
(
NSBinPptxRW
::
g_nodeAttributeEnd
);
oBinaryWriter
.
EndRecord
();
// ------------------------------------------------
oBinaryWriter
.
EndRecord
();
oBinaryWriter
.
EndRecord
();
}
}
...
...
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