Kaydet (Commit) b269b86c authored tarafından Julien Nabet's avatar Julien Nabet Kaydeden (comit) Michael Meeks

tdf#85303: SLIDESHOW cannot start at selected slide sometimes

When Slide Show/Slide Show Settings is selected and Ok button is clicked
the slide from "From" list box is stored in maPresPage and the fact that
this var is not empty makes slideshow considers it must be used.

So 2 things must be done:
1) Check first if "All Slides" has been selected
In this case, don't read slide from "From" in next block (ATTR_PRESENT_DIANAME)
and so let maPresPage empty
2) Empty maPresPage if "All Slides" has been selected to remove
any existing value

Change-Id: I6042ae2db6260e1f441a1c9db90f5de6de966f2a
Reviewed-on: https://gerrit.libreoffice.org/18253Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
(cherry picked from commit db9f846a)
Reviewed-on: https://gerrit.libreoffice.org/18298Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
Tested-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
üst 170eddb1
......@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment