Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Powerpoint writer: Another attempt at avoiding compiler warnings.

Browse source
This commit is contained in:
Jesse Rosenthal 2018-02-18 18:42:32 -05:00
parent b4f43f8799
commit 574104861f
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pandoc.cabal
View file

@ -143,7 +143,8 @@ data-files:
data/pptx/ppt/notesMasters/notesMaster1.xml
data/pptx/ppt/notesSlides/_rels/notesSlide1.xml.rels
data/pptx/ppt/notesSlides/notesSlide1.xml
data/pptx/ppt/notesSlides/_rels/notesSlide1.xml.rels
data/pptx/ppt/notesSlides/_rels/notesSlide2.xml.rels
data/pptx/ppt/notesSlides/notesSlide2.xml
data/pptx/ppt/theme/theme2.xml
data/pptx/[Content_Types].xml
-- stylesheet for EPUB writer

6
src/Text/Pandoc/Writers/Powerpoint/Output.hs
View file

@ -1268,8 +1268,6 @@ speakerNotesSlideNumber pgNum fieldId =
slideToSpeakerNotesElement :: PandocMonad m => Slide -> P m (Maybe Element)
slideToSpeakerNotesElement slide
| Slide _ _ mbNotes <- slide
, Nothing <- mbNotes = return Nothing
| Slide _ _ mbNotes <- slide
, Just (SpeakerNotes paras) <- mbNotes = do
master <- getNotesMaster
@ -1304,6 +1302,7 @@ slideToSpeakerNotesElement slide
]
]
]
slideToSpeakerNotesElement _ = return Nothing
-----------------------------------------------------------------------
@ -1465,8 +1464,6 @@ slideToSpeakerNotesEntry slide = do
slideToSpeakerNotesRelElement :: PandocMonad m => Slide -> P m (Maybe Element)
slideToSpeakerNotesRelElement slide
| Slide _ _ mbNotes <- slide
, Nothing <- mbNotes = return Nothing
| Slide _ _ mbNotes <- slide
, Just _ <- mbNotes = do
idNum <- slideNum slide
@ -1482,6 +1479,7 @@ slideToSpeakerNotesRelElement slide
, ("Target", "../notesMasters/notesMaster1.xml")
] ()
]
slideToSpeakerNotesRelElement _ = return Nothing
slideToSpeakerNotesRelEntry :: PandocMonad m => Slide -> P m (Maybe Entry)
slideToSpeakerNotesRelEntry slide = do