1 files changed, 12 insertions, 7 deletions
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index 8309219a8d31..b62eb9b88802 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -120,18 +120,23 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
 
         pDlg->GetAttr( aDlgSet );
 
-        aPage = ITEMVALUE( aDlgSet, ATTR_PRESENT_DIANAME, SfxStringItem );
-        if( aPage != rPresentationSettings.maPresPage )
-        {
-            bValuesChanged = true;
-            rPresentationSettings.maPresPage = aPage;
-        }
-
         bValue = ITEMVALUE( aDlgSet, ATTR_PRESENT_ALL, SfxBoolItem );
         if ( bValue != rPresentationSettings.mbAll )
         {
             bValuesChanged = true;
             rPresentationSettings.mbAll = bValue;
+            // remove any previous existing slide
+            rPresentationSettings.maPresPage = "";
+        }
+
+        if (!rPresentationSettings.mbAll)
+        {
+            aPage = ITEMVALUE( aDlgSet, ATTR_PRESENT_DIANAME, SfxStringItem );
+            if( aPage != rPresentationSettings.maPresPage )
+            {
+                bValuesChanged = true;
+                rPresentationSettings.maPresPage = aPage;
+            }
         }
 
         bValue = ITEMVALUE( aDlgSet, ATTR_PRESENT_CUSTOMSHOW, SfxBoolItem );