summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Rosenthal <jrosenthal@jhu.edu>2018-02-18 18:42:32 -0500
committerJesse Rosenthal <jrosenthal@jhu.edu>2018-02-18 18:54:16 -0500
commit574104861f13997effb36f8e3483dfd7c7d01cd7 (patch)
tree4147e79b4bbb883224277a7f7442c17315c0f31a
parentb4f43f879908592ebf28adc772127c46b0c1734d (diff)
Powerpoint writer: Another attempt at avoiding compiler warnings.
-rw-r--r--pandoc.cabal3
-rw-r--r--src/Text/Pandoc/Writers/Powerpoint/Output.hs6
2 files changed, 4 insertions, 5 deletions
diff --git a/pandoc.cabal b/pandoc.cabal
index c8035a960..2433313f1 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -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
diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs
index 752c81857..9a9ede864 100644
--- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs
+++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs
@@ -1269,8 +1269,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
fieldId <- getSlideNumberFieldId master
@@ -1304,6 +1302,7 @@ slideToSpeakerNotesElement slide
]
]
]
+slideToSpeakerNotesElement _ = return Nothing
-----------------------------------------------------------------------
@@ -1466,8 +1465,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
return $ Just $
@@ -1482,6 +1479,7 @@ slideToSpeakerNotesRelElement slide
, ("Target", "../notesMasters/notesMaster1.xml")
] ()
]
+slideToSpeakerNotesRelElement _ = return Nothing
slideToSpeakerNotesRelEntry :: PandocMonad m => Slide -> P m (Maybe Entry)
slideToSpeakerNotesRelEntry slide = do