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
68f24fa7
Commit
68f24fa7
authored
Sep 23, 2016
by
konovalovsergey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DocxFormat PPTXFormat include compatibility
parent
f2ac5383
Changes
31
Hide whitespace changes
Inline
Side-by-side
Showing
31 changed files
with
89 additions
and
116 deletions
+89
-116
ASCOfficePPTXFile/PPTXFormat/DocxFormat/ContentTypes/Default.h
...ficePPTXFile/PPTXFormat/DocxFormat/ContentTypes/Default.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/ContentTypes/DefaultTable.h
...PTXFile/PPTXFormat/DocxFormat/ContentTypes/DefaultTable.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/ContentTypes/ExtensionTable.h
...XFile/PPTXFormat/DocxFormat/ContentTypes/ExtensionTable.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/ContentTypes/File.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/ContentTypes/File.h
+2
-2
ASCOfficePPTXFile/PPTXFormat/DocxFormat/ContentTypes/Override.h
...icePPTXFile/PPTXFormat/DocxFormat/ContentTypes/Override.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/ContentTypes/OverrideTable.h
...TXFile/PPTXFormat/DocxFormat/ContentTypes/OverrideTable.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/DateTime.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/DateTime.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/External/External.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/External/External.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/External/ExternalAudio.h
...cePPTXFile/PPTXFormat/DocxFormat/External/ExternalAudio.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/External/ExternalImage.h
...cePPTXFile/PPTXFormat/DocxFormat/External/ExternalImage.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/External/ExternalVideo.h
...cePPTXFile/PPTXFormat/DocxFormat/External/ExternalVideo.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/External/HyperLink.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/External/HyperLink.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/File.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/File.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/FileType.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/FileType.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/FileTypes.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/FileTypes.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/IFileBuilder.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/IFileBuilder.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/IFileContainer.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/IFileContainer.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Media/Audio.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Media/Audio.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Media/Image.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Media/Image.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Media/Media.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Media/Media.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Media/OleObject.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Media/OleObject.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Media/Video.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Media/Video.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/NamespaceOwn.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/NamespaceOwn.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Namespaces.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Namespaces.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/RId.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/RId.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Rels/File.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Rels/File.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Rels/RelationShip.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Rels/RelationShip.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Rels/RelationTable.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Rels/RelationTable.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/UnknowTypeFile.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/UnknowTypeFile.h
+3
-3
ASCOfficePPTXFile/PPTXFormat/DocxFormat/WritingElement.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/WritingElement.h
+0
-27
ASCOfficePPTXFile/PPTXFormat/DocxFormat/WritingVector.h
ASCOfficePPTXFile/PPTXFormat/DocxFormat/WritingVector.h
+3
-3
No files found.
ASCOfficePPTXFile/PPTXFormat/DocxFormat/ContentTypes/Default.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_CONTENT_TYPES_DEFAULT_INCLUDE_H_
#ifndef
PPTX
OOX_CONTENT_TYPES_DEFAULT_INCLUDE_H_
#define OOX_CONTENT_TYPES_DEFAULT_INCLUDE_H_
#define
PPTX
OOX_CONTENT_TYPES_DEFAULT_INCLUDE_H_
#include "./../WritingElement.h"
#include "./../WritingElement.h"
#include "ExtensionTable.h"
#include "ExtensionTable.h"
...
@@ -95,4 +95,4 @@ namespace PPTX
...
@@ -95,4 +95,4 @@ namespace PPTX
}
// namespace ContentTypes
}
// namespace ContentTypes
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_CONTENT_TYPES_DEFAULT_INCLUDE_H_
#endif // PPTXOOX_CONTENT_TYPES_DEFAULT_INCLUDE_H_
\ No newline at end of file
\ No newline at end of file
ASCOfficePPTXFile/PPTXFormat/DocxFormat/ContentTypes/DefaultTable.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_CONTENT_TYPES_DEFAULT_TABLE_INCLUDE_H_
#ifndef
PPTX
OOX_CONTENT_TYPES_DEFAULT_TABLE_INCLUDE_H_
#define OOX_CONTENT_TYPES_DEFAULT_TABLE_INCLUDE_H_
#define
PPTX
OOX_CONTENT_TYPES_DEFAULT_TABLE_INCLUDE_H_
#include "./../WritingVector.h"
#include "./../WritingVector.h"
#include "Default.h"
#include "Default.h"
...
@@ -91,4 +91,4 @@ namespace PPTX
...
@@ -91,4 +91,4 @@ namespace PPTX
}
// namespace ContentTypes
}
// namespace ContentTypes
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_CONTENT)TYPES_DEFAULT_TABLE_INCLUDE_H_
#endif // PPTXOOX_CONTENT)TYPES_DEFAULT_TABLE_INCLUDE_H_
\ No newline at end of file
\ No newline at end of file
ASCOfficePPTXFile/PPTXFormat/DocxFormat/ContentTypes/ExtensionTable.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_CONTENT_TYPES_EXTENSION_TABLE_INCLUDE_H_
#ifndef
PPTX
OOX_CONTENT_TYPES_EXTENSION_TABLE_INCLUDE_H_
#define OOX_CONTENT_TYPES_EXTENSION_TABLE_INCLUDE_H_
#define
PPTX
OOX_CONTENT_TYPES_EXTENSION_TABLE_INCLUDE_H_
#include "../../../../Common/DocxFormat/Source/Base/Base.h"
#include "../../../../Common/DocxFormat/Source/Base/Base.h"
#include <map>
#include <map>
...
@@ -90,4 +90,4 @@ namespace PPTX
...
@@ -90,4 +90,4 @@ namespace PPTX
}
// namespace ContentTypes
}
// namespace ContentTypes
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_CONTENT_TYPES_EXTENSION_TABLE_INCLUDE_H_
#endif //
PPTX
OOX_CONTENT_TYPES_EXTENSION_TABLE_INCLUDE_H_
ASCOfficePPTXFile/PPTXFormat/DocxFormat/ContentTypes/File.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_CONTENT_TYPES_FILE_INCLUDE_H_
#ifndef
PPTX
OOX_CONTENT_TYPES_FILE_INCLUDE_H_
#define OOX_CONTENT_TYPES_FILE_INCLUDE_H_
#define
PPTX
OOX_CONTENT_TYPES_FILE_INCLUDE_H_
#include "OverrideTable.h"
#include "OverrideTable.h"
#include "DefaultTable.h"
#include "DefaultTable.h"
...
...
ASCOfficePPTXFile/PPTXFormat/DocxFormat/ContentTypes/Override.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_CONTENT_TYPES_OVERRIDE_INCLUDE_H_
#ifndef
PPTX
OOX_CONTENT_TYPES_OVERRIDE_INCLUDE_H_
#define OOX_CONTENT_TYPES_OVERRIDE_INCLUDE_H_
#define
PPTX
OOX_CONTENT_TYPES_OVERRIDE_INCLUDE_H_
#include "./../WritingElement.h"
#include "./../WritingElement.h"
#include "../../../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
#include "../../../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
...
@@ -98,4 +98,4 @@ namespace PPTX
...
@@ -98,4 +98,4 @@ namespace PPTX
}
// namespace ContentTypes
}
// namespace ContentTypes
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_CONTENT_TYPES_OVERRIDE_INCLUDE_H_
#endif // PPTXOOX_CONTENT_TYPES_OVERRIDE_INCLUDE_H_
\ No newline at end of file
\ No newline at end of file
ASCOfficePPTXFile/PPTXFormat/DocxFormat/ContentTypes/OverrideTable.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_CONTENT_TYPES_OVERRIDE_TABLE_INCLUDE_H_
#ifndef
PPTX
OOX_CONTENT_TYPES_OVERRIDE_TABLE_INCLUDE_H_
#define OOX_CONTENT_TYPES_OVERRIDE_TABLE_INCLUDE_H_
#define
PPTX
OOX_CONTENT_TYPES_OVERRIDE_TABLE_INCLUDE_H_
#include "./../WritingVector.h"
#include "./../WritingVector.h"
#include "Override.h"
#include "Override.h"
...
@@ -74,4 +74,4 @@ namespace PPTX
...
@@ -74,4 +74,4 @@ namespace PPTX
}
// namespace ContentTypes
}
// namespace ContentTypes
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_CONTENT_TYPES_OVERRIDE_TABLE_INCLUDE_H_
#endif // PPTXOOX_CONTENT_TYPES_OVERRIDE_TABLE_INCLUDE_H_
\ No newline at end of file
\ No newline at end of file
ASCOfficePPTXFile/PPTXFormat/DocxFormat/DateTime.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_DATE_TIME_INCLUDE_H_
#ifndef
PPTX
OOX_DATE_TIME_INCLUDE_H_
#define OOX_DATE_TIME_INCLUDE_H_
#define
PPTX
OOX_DATE_TIME_INCLUDE_H_
#include "../../../Common/DocxFormat/Source/Utility/Utility.h"
#include "../../../Common/DocxFormat/Source/Utility/Utility.h"
...
@@ -79,4 +79,4 @@ namespace PPTX
...
@@ -79,4 +79,4 @@ namespace PPTX
const
CString
DateTime
::
s_pattern
=
_T
(
"%YYYY-%MM-%DDT%hh:%mm:%ssZ"
);
const
CString
DateTime
::
s_pattern
=
_T
(
"%YYYY-%MM-%DDT%hh:%mm:%ssZ"
);
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_DATE_TIME_INCLUDE_H_
#endif //
PPTX
OOX_DATE_TIME_INCLUDE_H_
ASCOfficePPTXFile/PPTXFormat/DocxFormat/External/External.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_EXTERNAL_INCLUDE_H_
#ifndef
PPTX
OOX_EXTERNAL_INCLUDE_H_
#define OOX_EXTERNAL_INCLUDE_H_
#define
PPTX
OOX_EXTERNAL_INCLUDE_H_
#include "../File.h"
#include "../File.h"
#include "../FileTypes.h"
#include "../FileTypes.h"
...
@@ -73,4 +73,4 @@ namespace PPTX
...
@@ -73,4 +73,4 @@ namespace PPTX
};
};
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_EXTERNAL_INCLUDE_H_
#endif // PPTXOOX_EXTERNAL_INCLUDE_H_
\ No newline at end of file
\ No newline at end of file
ASCOfficePPTXFile/PPTXFormat/DocxFormat/External/ExternalAudio.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_EXTERNALAUDIO_INCLUDE_H_
#ifndef
PPTX
OOX_EXTERNALAUDIO_INCLUDE_H_
#define OOX_EXTERNALAUDIO_INCLUDE_H_
#define
PPTX
OOX_EXTERNALAUDIO_INCLUDE_H_
#include "External.h"
#include "External.h"
...
@@ -68,4 +68,4 @@ namespace PPTX
...
@@ -68,4 +68,4 @@ namespace PPTX
};
};
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_EXTERNALAUDIO_INCLUDE_H_
#endif // PPTXOOX_EXTERNALAUDIO_INCLUDE_H_
\ No newline at end of file
\ No newline at end of file
ASCOfficePPTXFile/PPTXFormat/DocxFormat/External/ExternalImage.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_EXTERNALIMAGE_INCLUDE_H_
#ifndef
PPTX
OOX_EXTERNALIMAGE_INCLUDE_H_
#define OOX_EXTERNALIMAGE_INCLUDE_H_
#define
PPTX
OOX_EXTERNALIMAGE_INCLUDE_H_
#include "External.h"
#include "External.h"
...
@@ -68,4 +68,4 @@ namespace PPTX
...
@@ -68,4 +68,4 @@ namespace PPTX
};
};
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_EXTERNALIMAGE_INCLUDE_H_
#endif // PPTXOOX_EXTERNALIMAGE_INCLUDE_H_
\ No newline at end of file
\ No newline at end of file
ASCOfficePPTXFile/PPTXFormat/DocxFormat/External/ExternalVideo.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_EXTERNALVIDEO_INCLUDE_H_
#ifndef
PPTX
OOX_EXTERNALVIDEO_INCLUDE_H_
#define OOX_EXTERNALVIDEO_INCLUDE_H_
#define
PPTX
OOX_EXTERNALVIDEO_INCLUDE_H_
#include "External.h"
#include "External.h"
...
@@ -68,4 +68,4 @@ namespace PPTX
...
@@ -68,4 +68,4 @@ namespace PPTX
};
};
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_EXTERNALVIDEO_INCLUDE_H_
#endif // PPTXOOX_EXTERNALVIDEO_INCLUDE_H_
\ No newline at end of file
\ No newline at end of file
ASCOfficePPTXFile/PPTXFormat/DocxFormat/External/HyperLink.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_HYPERLINK_INCLUDE_H_
#ifndef
PPTX
OOX_HYPERLINK_INCLUDE_H_
#define OOX_HYPERLINK_INCLUDE_H_
#define
PPTX
OOX_HYPERLINK_INCLUDE_H_
#include "External.h"
#include "External.h"
...
@@ -68,4 +68,4 @@ namespace PPTX
...
@@ -68,4 +68,4 @@ namespace PPTX
};
};
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_HYPERLINK_INCLUDE_H_
#endif // PPTXOOX_HYPERLINK_INCLUDE_H_
\ No newline at end of file
\ No newline at end of file
ASCOfficePPTXFile/PPTXFormat/DocxFormat/File.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_FILE_INCLUDE_H_
#ifndef
PPTX
OOX_FILE_INCLUDE_H_
#define OOX_FILE_INCLUDE_H_
#define
PPTX
OOX_FILE_INCLUDE_H_
#include "../../../Common/DocxFormat/Source/XML/XmlSimple.h"
#include "../../../Common/DocxFormat/Source/XML/XmlSimple.h"
#include "../../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
#include "../../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
...
@@ -58,4 +58,4 @@ namespace PPTX
...
@@ -58,4 +58,4 @@ namespace PPTX
};
};
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_FILE_INCLUDE_H_
#endif // PPTXOOX_FILE_INCLUDE_H_
\ No newline at end of file
\ No newline at end of file
ASCOfficePPTXFile/PPTXFormat/DocxFormat/FileType.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_FILE_TYPE_INCLUDE_H_
#ifndef
PPTX
OOX_FILE_TYPE_INCLUDE_H_
#define OOX_FILE_TYPE_INCLUDE_H_
#define
PPTX
OOX_FILE_TYPE_INCLUDE_H_
#include "../../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
#include "../../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
...
@@ -112,4 +112,4 @@ namespace PPTX
...
@@ -112,4 +112,4 @@ namespace PPTX
}
}
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_FILE_TYPE_INCLUDE_H_
#endif //
PPTX
OOX_FILE_TYPE_INCLUDE_H_
ASCOfficePPTXFile/PPTXFormat/DocxFormat/FileTypes.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_FILE_TYPES_INCLUDE_H_
#ifndef
PPTX
OOX_FILE_TYPES_INCLUDE_H_
#define OOX_FILE_TYPES_INCLUDE_H_
#define
PPTX
OOX_FILE_TYPES_INCLUDE_H_
#include "FileType.h"
#include "FileType.h"
...
@@ -285,4 +285,4 @@ namespace PPTX
...
@@ -285,4 +285,4 @@ namespace PPTX
}
// namespace FileTypes
}
// namespace FileTypes
}
// namespace OOX
}
// namespace OOX
#endif // OOX_FILE_TYPES_INCLUDE_H_
#endif // PPTXOOX_FILE_TYPES_INCLUDE_H_
\ No newline at end of file
\ No newline at end of file
ASCOfficePPTXFile/PPTXFormat/DocxFormat/IFileBuilder.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_FILE_BUILDER_INCLUDE_H_
#ifndef
PPTX
OOX_FILE_BUILDER_INCLUDE_H_
#define OOX_FILE_BUILDER_INCLUDE_H_
#define
PPTX
OOX_FILE_BUILDER_INCLUDE_H_
#include "ContentTypes/File.h"
#include "ContentTypes/File.h"
...
@@ -50,4 +50,4 @@ namespace PPTX
...
@@ -50,4 +50,4 @@ namespace PPTX
};
};
}
// namespace OOX
}
// namespace OOX
#endif // OOX_FILE_BUILDER_INCLUDE_H_
#endif //
PPTX
OOX_FILE_BUILDER_INCLUDE_H_
ASCOfficePPTXFile/PPTXFormat/DocxFormat/IFileContainer.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_IFILE_CONTAINER_INCLUDE_H_
#ifndef
PPTX
OOX_IFILE_CONTAINER_INCLUDE_H_
#define OOX_IFILE_CONTAINER_INCLUDE_H_
#define
PPTX
OOX_IFILE_CONTAINER_INCLUDE_H_
#include "RId.h"
#include "RId.h"
#include "UnknowTypeFile.h"
#include "UnknowTypeFile.h"
...
@@ -126,4 +126,4 @@ namespace PPTX
...
@@ -126,4 +126,4 @@ namespace PPTX
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_IFILE_CONTAINER_INCLUDE_H_
#endif //
PPTX
OOX_IFILE_CONTAINER_INCLUDE_H_
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Media/Audio.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_AUDIO_INCLUDE_H_
#ifndef
PPTX
OOX_AUDIO_INCLUDE_H_
#define OOX_AUDIO_INCLUDE_H_
#define
PPTX
OOX_AUDIO_INCLUDE_H_
#include "Media.h"
#include "Media.h"
...
@@ -67,4 +67,4 @@ namespace PPTX
...
@@ -67,4 +67,4 @@ namespace PPTX
};
};
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_AUDIO_INCLUDE_H_
#endif // PPTXOOX_AUDIO_INCLUDE_H_
\ No newline at end of file
\ No newline at end of file
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Media/Image.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_IMAGE_INCLUDE_H_
#ifndef
PPTX
OOX_IMAGE_INCLUDE_H_
#define OOX_IMAGE_INCLUDE_H_
#define
PPTX
OOX_IMAGE_INCLUDE_H_
#include "Media.h"
#include "Media.h"
...
@@ -96,4 +96,4 @@ namespace PPTX
...
@@ -96,4 +96,4 @@ namespace PPTX
};
};
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_IMAGE_INCLUDE_H_
#endif // PPTXOOX_IMAGE_INCLUDE_H_
\ No newline at end of file
\ No newline at end of file
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Media/Media.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_MEDIA_INCLUDE_H_
#ifndef
PPTX
OOX_MEDIA_INCLUDE_H_
#define OOX_MEDIA_INCLUDE_H_
#define
PPTX
OOX_MEDIA_INCLUDE_H_
#include "../File.h"
#include "../File.h"
#include "../FileTypes.h"
#include "../FileTypes.h"
...
@@ -100,4 +100,4 @@ namespace PPTX
...
@@ -100,4 +100,4 @@ namespace PPTX
};
};
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_MEDIA_INCLUDE_H_
#endif //
PPTX
OOX_MEDIA_INCLUDE_H_
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Media/OleObject.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_OLE_OBJECT_INCLUDE_H_
#ifndef
PPTX
OOX_OLE_OBJECT_INCLUDE_H_
#define OOX_OLE_OBJECT_INCLUDE_H_
#define
PPTX
OOX_OLE_OBJECT_INCLUDE_H_
#include "Media.h"
#include "Media.h"
...
@@ -81,4 +81,4 @@ namespace PPTX
...
@@ -81,4 +81,4 @@ namespace PPTX
};
};
}
// namespace OOX
}
// namespace OOX
#endif // OOX_OLE_OBJECT_INCLUDE_H_
#endif // PPTXOOX_OLE_OBJECT_INCLUDE_H_
\ No newline at end of file
\ No newline at end of file
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Media/Video.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_VIDEO_INCLUDE_H_
#ifndef
PPTX
OOX_VIDEO_INCLUDE_H_
#define OOX_VIDEO_INCLUDE_H_
#define
PPTX
OOX_VIDEO_INCLUDE_H_
#include "Media.h"
#include "Media.h"
...
@@ -68,4 +68,4 @@ namespace PPTX
...
@@ -68,4 +68,4 @@ namespace PPTX
};
};
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_VIDEO_INCLUDE_H_
#endif // PPTXOOX_VIDEO_INCLUDE_H_
\ No newline at end of file
\ No newline at end of file
ASCOfficePPTXFile/PPTXFormat/DocxFormat/NamespaceOwn.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_NAMESPACE_OWN_INCLUDE_H_
#ifndef
PPTX
OOX_NAMESPACE_OWN_INCLUDE_H_
#define OOX_NAMESPACE_OWN_INCLUDE_H_
#define
PPTX
OOX_NAMESPACE_OWN_INCLUDE_H_
#include "Namespaces.h"
#include "Namespaces.h"
...
@@ -47,4 +47,4 @@ namespace PPTX
...
@@ -47,4 +47,4 @@ namespace PPTX
static
Namespaces
g_Namespaces
;
static
Namespaces
g_Namespaces
;
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_NAMESPACE_OWN_INCLUDE_H_
#endif // PPTXOOX_NAMESPACE_OWN_INCLUDE_H_
\ No newline at end of file
\ No newline at end of file
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Namespaces.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_NAMESPACES_INCLUDE_H_
#ifndef
PPTX
OOX_NAMESPACES_INCLUDE_H_
#define OOX_NAMESPACES_INCLUDE_H_
#define
PPTX
OOX_NAMESPACES_INCLUDE_H_
#include "../../../Common/DocxFormat/Source/Base/Base.h"
#include "../../../Common/DocxFormat/Source/Base/Base.h"
#if defined(_WIN32) || defined (_WIN64)
#if defined(_WIN32) || defined (_WIN64)
...
@@ -135,4 +135,4 @@ namespace PPTX
...
@@ -135,4 +135,4 @@ namespace PPTX
};
};
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_NAMESPACES_INCLUDE_H_
#endif //
PPTX
OOX_NAMESPACES_INCLUDE_H_
ASCOfficePPTXFile/PPTXFormat/DocxFormat/RId.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_RID_INCLUDE_H_
#ifndef
PPTX
OOX_RID_INCLUDE_H_
#define OOX_RID_INCLUDE_H_
#define
PPTX
OOX_RID_INCLUDE_H_
#include "../../../Common/DocxFormat/Source/Base/Base.h"
#include "../../../Common/DocxFormat/Source/Base/Base.h"
#include "../../../Common/DocxFormat/Source/XML/xmlutils.h"
#include "../../../Common/DocxFormat/Source/XML/xmlutils.h"
...
@@ -133,4 +133,4 @@ namespace PPTX
...
@@ -133,4 +133,4 @@ namespace PPTX
};
};
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_RID_INCLUDE_H_
#endif //
PPTX
OOX_RID_INCLUDE_H_
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Rels/File.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_RELS_FILE_INCLUDE_H_
#ifndef
PPTX
OOX_RELS_FILE_INCLUDE_H_
#define OOX_RELS_FILE_INCLUDE_H_
#define
PPTX
OOX_RELS_FILE_INCLUDE_H_
#include "RelationTable.h"
#include "RelationTable.h"
#include "./../FileType.h"
#include "./../FileType.h"
...
@@ -157,4 +157,4 @@ namespace PPTX
...
@@ -157,4 +157,4 @@ namespace PPTX
}
// namespace Rels
}
// namespace Rels
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_RELS_FILE_INCLUDE_H_
#endif //
PPTX
OOX_RELS_FILE_INCLUDE_H_
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Rels/RelationShip.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_RELS_RELATION_SHIP_INCLUDE_H_
#ifndef
PPTX
OOX_RELS_RELATION_SHIP_INCLUDE_H_
#define OOX_RELS_RELATION_SHIP_INCLUDE_H_
#define
PPTX
OOX_RELS_RELATION_SHIP_INCLUDE_H_
#include "./../WritingElement.h"
#include "./../WritingElement.h"
#include "./../RId.h"
#include "./../RId.h"
...
@@ -124,4 +124,4 @@ namespace PPTX
...
@@ -124,4 +124,4 @@ namespace PPTX
}
// namespace Rels
}
// namespace Rels
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_RELS_RELATION_SHIP_INCLUDE_H_
#endif //
PPTX
OOX_RELS_RELATION_SHIP_INCLUDE_H_
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Rels/RelationTable.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_RELS_RELATION_TABLE_INCLUDE_H_
#ifndef
PPTX
OOX_RELS_RELATION_TABLE_INCLUDE_H_
#define OOX_RELS_RELATION_TABLE_INCLUDE_H_
#define
PPTX
OOX_RELS_RELATION_TABLE_INCLUDE_H_
#include "./../WritingVector.h"
#include "./../WritingVector.h"
#include "RelationShip.h"
#include "RelationShip.h"
...
@@ -75,4 +75,4 @@ namespace PPTX
...
@@ -75,4 +75,4 @@ namespace PPTX
}
// namespace Rels
}
// namespace Rels
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_RELS_RELATION_TABLE_INCLUDE_H_
#endif // PPTXOOX_RELS_RELATION_TABLE_INCLUDE_H_
\ No newline at end of file
\ No newline at end of file
ASCOfficePPTXFile/PPTXFormat/DocxFormat/UnknowTypeFile.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_UNKNOW_TYPE_FILE_INCLUDE_H_
#ifndef
PPTX
OOX_UNKNOW_TYPE_FILE_INCLUDE_H_
#define OOX_UNKNOW_TYPE_FILE_INCLUDE_H_
#define
PPTX
OOX_UNKNOW_TYPE_FILE_INCLUDE_H_
#include "File.h"
#include "File.h"
#include "FileTypes.h"
#include "FileTypes.h"
...
@@ -73,4 +73,4 @@ namespace PPTX
...
@@ -73,4 +73,4 @@ namespace PPTX
};
};
}
// namespace OOX
}
// namespace OOX
#endif // OOX_UNKNOW_TYPE_FILE_INCLUDE_H_
#endif // PPTXOOX_UNKNOW_TYPE_FILE_INCLUDE_H_
\ No newline at end of file
\ No newline at end of file
ASCOfficePPTXFile/PPTXFormat/DocxFormat/WritingElement.h
View file @
68f24fa7
...
@@ -40,33 +40,6 @@
...
@@ -40,33 +40,6 @@
namespace
PPTX
namespace
PPTX
{
{
#define WritingElement_AdditionConstructors(Class) \
Class
(
XmlUtils
::
CXmlNode
&
oNode
)
\
{
\
fromXML
(
oNode
);
\
}
\
const
Class
&
operator
=
(
const
XmlUtils
::
CXmlNode
&
oNode
)
\
{
\
fromXML
(
(
XmlUtils
::
CXmlNode
&
)
oNode
);
\
return
*
this
;
\
}
#define WritingElement_ReadNode( oRootNode, oChildNode, sNodeName, oValue ) \
if
(
oRootNode
.
GetNode
(
sNodeName
,
oChildNode
)
)
\
oValue
=
oChildNode
;
#define WritingElement_WriteNode_1( sStartNodeString, oValue ) \
if
(
oValue
.
IsInit
()
)
\
{
\
sResult
+=
sStartNodeString
;
\
sResult
+=
oValue
->
ToString
();
\
sResult
+=
_T
(
"/>"
);
\
}
#define WritingElement_WriteNode_2( oValue ) \
if
(
oValue
.
IsInit
()
)
\
sResult
+=
oValue
->
toXML
();
enum
EElementType
enum
EElementType
{
{
et_Unknown
,
et_Unknown
,
...
...
ASCOfficePPTXFile/PPTXFormat/DocxFormat/WritingVector.h
View file @
68f24fa7
...
@@ -30,8 +30,8 @@
...
@@ -30,8 +30,8 @@
*
*
*/
*/
#pragma once
#pragma once
#ifndef OOX_WRITING_VECTOR_INCLUDE_H_
#ifndef
PPTX
OOX_WRITING_VECTOR_INCLUDE_H_
#define OOX_WRITING_VECTOR_INCLUDE_H_
#define
PPTX
OOX_WRITING_VECTOR_INCLUDE_H_
#include "WritingElement.h"
#include "WritingElement.h"
...
@@ -94,4 +94,4 @@ namespace PPTX
...
@@ -94,4 +94,4 @@ namespace PPTX
};
};
}
// namespace PPTX
}
// namespace PPTX
#endif // OOX_WRITING_VECTOR_INCLUDE_H_
#endif // PPTXOOX_WRITING_VECTOR_INCLUDE_H_
\ No newline at end of file
\ No newline at end of file
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