diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-08-21 10:45:39 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-08-21 12:33:19 +0300 |
commit | f8bf090bbba61e8cd198a936dcc25f35fdf23c10 (patch) | |
tree | d5793ed1ef4028bd488bb5427279694ce09205d2 | |
parent | 632e4095ad92196480ad82cfa1f106c4c08ae1cc (diff) |
These "newly added" record types are publicly documented nowadays
Use symbolic names from the MS-PPT RecordType documentation,
http://msdn.microsoft.com/en-us/library/dd945336(v=office.12).aspx
Change-Id: I1deecfc69dd3360ef982f144d5ff5348a2953280
-rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 20 | ||||
-rw-r--r-- | include/filter/msfilter/svdfppt.hxx | 20 | ||||
-rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 6 | ||||
-rw-r--r-- | svx/workben/msview/msview.xml | 8 |
4 files changed, 27 insertions, 27 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index cacf65cab714..f2c915eb164a 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -3230,12 +3230,12 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const OSL_FAIL( "PPTExParaProv::PPTExParaProv - unknown atom reading ppt2000 num rules (SJ)" ); case PPT_PST_MasterText : // first seen in: ms-tt02.ppt case PPT_PST_SrKinsoku : - case PPT_PST_NewlyAddedAtom4016 : - case PPT_PST_NewlyAddedAtomByPPT2000_6010 : - case PPT_PST_NewlyAddedAtomByPPT2000_6011 : - case PPT_PST_NewlyAddedAtomByXP1037 : - case PPT_PST_NewlyAddedAtomByXP12004 : - case PPT_PST_NewlyAddedAtomByXP14001 : + case PPT_PST_TextDefaults9Atom : + case PPT_PST_PresentationAdvisorFlags9Atom : + case PPT_PST_HtmlDocInfo9Atom : + case PPT_PST_GridSpacing10Atom : + case PPT_PST_CommentIndex10 : + case PPT_PST_DocToolbarStates10Atom : break; #endif } @@ -3283,10 +3283,10 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const break; default : OSL_FAIL( "PPTExParaProv::PPTExParaProv - unknown atom, assuming PPT_PST_ExtendedParagraphMasterAtom (SJ)" ); - case PPT_PST_NewlyAddedAtomByXP11008 : - case PPT_PST_NewlyAddedAtomByXP11010 : - case PPT_PST_NewlyAddedAtomByXP12010 : - case PPT_PST_NewlyAddedAtomByXP12011 : + case PPT_PST_HashCodeAtom : + case PPT_PST_BuildList : + case PPT_PST_SlideFlags10Atom : + case PPT_PST_SlideTime10Atom : case 0xf144 : break; } diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 809b96af9ce4..cd3b65b95b07 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -1366,7 +1366,7 @@ public : #define PPT_PST_ExObjListAtom 1034 #define PPT_PST_PPDrawingGroup 1035 #define PPT_PST_PPDrawing 1036 -#define PPT_PST_NewlyAddedAtomByXP1037 1037 +#define PPT_PST_GridSpacing10Atom 1037 #define PPT_PST_NamedShows 1040 #define PPT_PST_NamedShow 1041 #define PPT_PST_NamedShowSlides 1042 @@ -1420,7 +1420,7 @@ public : #define PPT_PST_ExtendedPresRuleContainer 4014 // consist of 4012, 4015, #define PPT_PST_ExtendedParagraphHeaderAtom 4015 // the instance of this atom indices the current presobj // the first sal_uInt32 in this atom indices the current slideId -#define PPT_PST_NewlyAddedAtom4016 4016 +#define PPT_PST_TextDefaults9Atom 4016 #define PPT_PST_FontEntityAtom 4023 #define PPT_PST_FontEmbedData 4024 @@ -1497,8 +1497,8 @@ public : #define PPT_PST_PersistPtrIncrementalBlock 6002 // these atoms first was seen in ppt2000 in a private Tag atom -#define PPT_PST_NewlyAddedAtomByPPT2000_6010 6010 -#define PPT_PST_NewlyAddedAtomByPPT2000_6011 6011 +#define PPT_PST_PresentationAdvisorFlags9Atom 6010 +#define PPT_PST_HtmlDocInfo9Atom 6011 #define PPT_PST_RulerIndentAtom 10000 #define PPT_PST_GscalingAtom 10001 @@ -1506,14 +1506,14 @@ public : #define PPT_PST_GLPointAtom 10003 #define PPT_PST_GlineAtom 10004 -#define PPT_PST_NewlyAddedAtomByXP11008 11008 -#define PPT_PST_NewlyAddedAtomByXP11010 11010 +#define PPT_PST_HashCodeAtom 11008 +#define PPT_PST_BuildList 11010 #define PPT_PST_Comment10 12000 #define PPT_PST_CommentAtom10 12001 -#define PPT_PST_NewlyAddedAtomByXP12004 12004 -#define PPT_PST_NewlyAddedAtomByXP12010 12010 -#define PPT_PST_NewlyAddedAtomByXP12011 12011 -#define PPT_PST_NewlyAddedAtomByXP14001 14001 +#define PPT_PST_CommentIndex10 12004 +#define PPT_PST_SlideFlags10Atom 12010 +#define PPT_PST_SlideTime10Atom 12011 +#define PPT_PST_DocToolbarStates10Atom 14001 // attributes for PptTextStyleSheet #define PPT_ParaAttr_BulletOn 0 //00000001 diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index a5beb9701bb7..12a89b9e49bd 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -920,11 +920,11 @@ bool ImplSdPPTImport::Import() } break; - case PPT_PST_NewlyAddedAtomByXP11008 : // ??? + case PPT_PST_HashCodeAtom : // ??? break; - case PPT_PST_NewlyAddedAtomByXP12011 : // ??? don't know, this atom is always 8 bytes big - break; // and is appearing in nearly every l10 progtag + case PPT_PST_SlideTime10Atom : // ??? don't know, this atom is always 8 bytes big + break; // and is appearing in nearly every l10 progtag } aProgTagContentHd.SeekToEndOfRecord( rStCtrl ); } diff --git a/svx/workben/msview/msview.xml b/svx/workben/msview/msview.xml index 8e5206213426..d24b089bf77e 100644 --- a/svx/workben/msview/msview.xml +++ b/svx/workben/msview/msview.xml @@ -62,7 +62,7 @@ <atom name="ExObjListAtom" id="1034"/> <atom name="PPDrawingGroup" id="1035"/> <atom name="PPDrawing" id="1036"/> -<atom name="NewlyAddedAtomByXP1037 " id="1037"/> +<atom name="GridSpacing10Atom" id="1037"/> <atom name="NamedShows" id="1040"/> <atom name="NamedShow" id="1041"/> <atom name="NamedShowSlides" id="1042"/> @@ -110,7 +110,7 @@ <atom name="ExtendedParagraphMasterAtom" id="4013"/> <atom name="ExtendedPresRuleatom" id="4014"/> <atom name="ExtendedParagraphHeaderAtom" id="4015"/> -<atom name="NewlyAddedAtom4016" id="4016"/> +<atom name="TextDefaults9Atom" id="4016"/> <atom name="FontEntityAtom" id="4023"/> <atom name="FontEmbedData" id="4024"/> <atom name="TypeFace" id="4025"/> @@ -186,8 +186,8 @@ <atom name="PrintOptions" id="6000"/> <atom name="PersistPtrFullBlock" id="6001"/> <atom name="PersistPtrIncrementalBlock" id="6002"/> -<atom name="NewlyAddedAtomByPPT2000_6010" id="6010"/> -<atom name="NewlyAddedAtomByPPT2000_6011" id="6011"/> +<atom name="PresentationAdvisorFlags9Atom" id="6010"/> +<atom name="HtmlDocInfo9Atom" id="6011"/> <!-- animations--> <atom name="AnimEvent" id="0xf125"/> |