[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sd/qa sd/source
sd/qa/uitest/impress_tests/data/tdf127900.fodp | 778 + sd/qa/uitest/impress_tests/tdf127900.py| 46 + sd/source/ui/view/drawview.cxx |3 3 files changed, 826 insertions(+), 1 deletion(-) New commits: commit dbfb7940e4e6b0a1f136a6d109d0e6926617208f Author: Attila Bakos (NISZ) AuthorDate: Tue Aug 24 16:48:07 2021 +0200 Commit: Xisco Fauli CommitDate: Wed Sep 22 10:45:49 2021 +0200 tdf#127900 sd: fix regression at applying master properties Language settings of frames in slide master weren't applied on the slides based on that master. Regression since LO 6.3 by "tdf#126067 Fix slide scope feature." (commit 40bb9ac690d979ef544d5aa759bd734a176912a0). Co-developed-by: Dániel Arató (NISZ) Change-Id: I559adbe00870ed8a3d2947fef8dae435a387e34a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120993 Tested-by: László Németh Reviewed-by: László Németh Signed-off-by: Xisco Fauli Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122397 Tested-by: Jenkins diff --git a/sd/qa/uitest/impress_tests/data/tdf127900.fodp b/sd/qa/uitest/impress_tests/data/tdf127900.fodp new file mode 100644 index ..adedafc2757a --- /dev/null +++ b/sd/qa/uitest/impress_tests/data/tdf127900.fodp @@ -0,0 +1,778 @@ + + +http://openoffice.org/2004/office; xmlns:xlink="http://www.w3.org/1999/xlink; xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:rpt="http://openoffice.org/2005/report; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:ooow="http://openoffice.org/200 4/writer" xmlns:oooc="http://openoffice.org/2004/calc; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:drawooo="http://openoffice.org/2010/draw; xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:dom="http://www.w3.org/2001/xml-events; xmlns:xforms="http://www.w3.org/2002/xforms; xmlns:xsd="http://www.w3.org/2001/XMLSchema; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xhtml="http://www.w3.org/1999/xhtml; xmlns:grddl="http://www.w3.org/2003/g/data-view#; xmlns :css3t="http://www.w3.org/TR/css3-text/; xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:officeooo="http://openoffice.org/2009/office; office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.presentation"> + 2021-08-30T08:55:10.39400LibreOffice/7.1.1.2$Windows_X86_64 LibreOffice_project/fe0b08f4af1bacafe4c7ecc87ce55bb4261646762021-08-30T08:56:29.11600PT7S1 + + + 0 + 0 + 14099 + + + + view1 + false + false + true + true + true + true + false + false + true + 1500 + false + Hw== + Hw== + + false + true + false + 0 + 1 + false + true + true + 4 + 0 + -974 + -423 + 28894 + 17739 + 2000 + 2000 + 500 + 500 + 2000 + 4 + 2000 + 4 + false + 1500 + true + false + + + + + true + $(inst)/share/palette%3B$(user)/config/standard.sob + 0 + $(inst)/share/palette%3B$(user)/config/standard.soc + $(inst)/share/palette%3B$(user)/config/standard.sod + 1250 + true + true + false + true + false + $(inst)/share/palette%3B$(user)/config/standard.sog + true + $(inst)/share/palette%3B$(user)/config/standard.soh + false + false + true + true + false + true + false + false + true + false + false + false + false + false + $(inst)/share/palette%3B$(user)/config/standard.soe + false + 4 + false + 0 + low-resolution + Microsoft Print to PDF + false +
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sd/qa sd/source
sd/qa/unit/data/pptx/tdf143624.pptx |binary
sd/qa/unit/export-tests-ooxml1.cxx | 16
sd/source/filter/eppt/pptx-epptooxml.cxx |2 ++
3 files changed, 18 insertions(+)
New commits:
commit 6e9e0ad4e2ab485eefe1529d72d623101009e120
Author: Tibor Nagy
AuthorDate: Mon Aug 16 11:05:39 2021 +0200
Commit: Xisco Fauli
CommitDate: Fri Aug 20 09:45:10 2021 +0200
tdf#143624 PPTX: slideshow setting “Manual forwarding” not exported
Follow-up to commit f8ddaaf0f5e1fb61e0d4404ea28757bc652ae4be
(tdf#142915 PPTX import: support for presentation's timing attribute).
Change-Id: I1b175d406d2cd0fc40ba7085517709fb477fed58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120529
Tested-by: László Németh
Reviewed-by: László Németh
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120751
Tested-by: Jenkins
diff --git a/sd/qa/unit/data/pptx/tdf143624.pptx
b/sd/qa/unit/data/pptx/tdf143624.pptx
new file mode 100644
index ..1eed8fedaa03
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf143624.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx
b/sd/qa/unit/export-tests-ooxml1.cxx
index 59848719adf0..b191cc62ee76 100644
--- a/sd/qa/unit/export-tests-ooxml1.cxx
+++ b/sd/qa/unit/export-tests-ooxml1.cxx
@@ -61,6 +61,7 @@ using namespace css;
class SdOOXMLExportTest1 : public SdModelTestBaseXML
{
public:
+void testTdf143624();
void testTdf142648();
void testTdf47365();
void testTdf125071();
@@ -123,6 +124,7 @@ public:
CPPUNIT_TEST_SUITE(SdOOXMLExportTest1);
+CPPUNIT_TEST(testTdf143624);
CPPUNIT_TEST(testTdf142648);
CPPUNIT_TEST(testTdf47365);
CPPUNIT_TEST(testTdf125071);
@@ -212,6 +214,20 @@ void checkFontAttributes( const SdrTextObj* pObj,
ItemValue nVal, sal_uInt32 nId
}
+void SdOOXMLExportTest1::testTdf143624()
+{
+sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf143624.pptx"), PPTX );
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, );
+xDocShRef->DoClose();
+
+xmlDocUniquePtr pXmlDoc = parseExport(tempFile, "ppt/presProps.xml");
+
+assertXPath(pXmlDoc, "/p:presentationPr/p:showPr", "useTimings", "0");
+
+assertXPath(pXmlDoc, "/p:presentationPr/p:showPr", "showNarration", "1");
+}
+
void SdOOXMLExportTest1::testTdf142648()
{
sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf142648.pptx"), PPTX );
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 0cf86db84340..2797b296abcf 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1067,6 +1067,7 @@ void PowerPointExport::WritePresentationProps()
Reference
xPresentationProps(xPresentationSupplier->getPresentation(),
uno::UNO_QUERY);
bool bEndlessVal =
xPresentationProps->getPropertyValue("IsEndless").get();
+bool bChangeManually =
xPresentationProps->getPropertyValue("IsAutomatic").get();
OUString sFirstPage =
xPresentationProps->getPropertyValue("FirstPage").get();
OUString sCustomShow =
xPresentationProps->getPropertyValue("CustomShow").get();
@@ -1080,6 +1081,7 @@ void PowerPointExport::WritePresentationProps()
pFS->startElementNS(XML_p, XML_presentationPr, PPRNMSS);
pFS->startElementNS(XML_p, XML_showPr, XML_loop,
sax_fastparser::UseIf("1", bEndlessVal),
+XML_useTimings, sax_fastparser::UseIf("0",
bChangeManually),
XML_showNarration, "1");
Reference xDPS(mXModel,
uno::UNO_QUERY_THROW);
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sd/qa sd/source
sd/qa/unit/data/pptx/tdf143129.pptx |binary
sd/qa/unit/export-tests-ooxml1.cxx | 15 +++
sd/source/filter/eppt/pptx-epptooxml.cxx | 22 ++
3 files changed, 37 insertions(+)
New commits:
commit 6d0ef663227cde189b307036be7d3dfc6ca6ce4c
Author: Tibor Nagy
AuthorDate: Tue Jul 27 16:17:37 2021 +0200
Commit: Xisco Fauli
CommitDate: Thu Aug 12 19:29:46 2021 +0200
tdf#143129 PPTX: custom slide show use as default is not exported.
Follow-up to commit 11ef976624dce8a8e50a1eb20e9c586519fd7ec8
"tdf#142590 PPTX import: fix custom slide show use as default"
Change-Id: Ie8a53a79bd531cfe2c3b3559b70d28770ca8b960
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119564
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit 569cb54f1d82e993dcf1fd11d92d4cbd4f224a2d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120364
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sd/qa/unit/data/pptx/tdf143129.pptx
b/sd/qa/unit/data/pptx/tdf143129.pptx
new file mode 100644
index ..77377c212be8
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf143129.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx
b/sd/qa/unit/export-tests-ooxml1.cxx
index 8c1db529b89c..34d9c9865b70 100644
--- a/sd/qa/unit/export-tests-ooxml1.cxx
+++ b/sd/qa/unit/export-tests-ooxml1.cxx
@@ -118,6 +118,7 @@ public:
void testTdf124457();
void testPlaceholderFillAndOutlineExport();
void testTdf143126();
+void testTdf143129();
CPPUNIT_TEST_SUITE(SdOOXMLExportTest1);
@@ -178,6 +179,7 @@ public:
CPPUNIT_TEST(testTdf124457);
CPPUNIT_TEST(testPlaceholderFillAndOutlineExport);
CPPUNIT_TEST(testTdf143126);
+CPPUNIT_TEST(testTdf143129);
CPPUNIT_TEST_SUITE_END();
@@ -1571,6 +1573,19 @@ void SdOOXMLExportTest1::testTdf143126()
assertXPath(pXmlDoc, "/p:presentationPr/p:showPr/p:sldRg", "end", "3" );
}
+void SdOOXMLExportTest1::testTdf143129()
+{
+sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf143129.pptx"),
PPTX);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, );
+xDocShRef->DoClose();
+
+xmlDocUniquePtr pXmlDoc = parseExport(tempFile, "ppt/presProps.xml");
+
+assertXPath(pXmlDoc, "/p:presentationPr/p:showPr", "showNarration", "1");
+assertXPath(pXmlDoc, "/p:presentationPr/p:showPr/p:custShow", "id", "0" );
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest1);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index e9b219bbcd6e..0cf86db84340 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1068,6 +1068,7 @@ void PowerPointExport::WritePresentationProps()
uno::UNO_QUERY);
bool bEndlessVal =
xPresentationProps->getPropertyValue("IsEndless").get();
OUString sFirstPage =
xPresentationProps->getPropertyValue("FirstPage").get();
+OUString sCustomShow =
xPresentationProps->getPropertyValue("CustomShow").get();
FSHelperPtr pFS = openFragmentStreamWithSerializer(
"ppt/presProps.xml",
@@ -1103,6 +1104,27 @@ void PowerPointExport::WritePresentationProps()
OUString::number(nEndSlide));
}
+if (!sCustomShow.isEmpty())
+{
+css::uno::Reference
+XCustPresentationSupplier(mXModel, css::uno::UNO_QUERY_THROW);
+css::uno::Reference mxCustShows;
+mxCustShows = XCustPresentationSupplier->getCustomPresentations();
+const css::uno::Sequence
aNameSeq(mxCustShows->getElementNames());
+
+sal_Int32 nCustShowIndex = 0;
+for (sal_Int32 i = 0; i < aNameSeq.getLength(); i++)
+{
+if (aNameSeq[i] == sCustomShow)
+{
+nCustShowIndex = i;
+break;
+}
+}
+
+pFS->singleElementNS(XML_p, XML_custShow, XML_id,
OUString::number(nCustShowIndex));
+}
+
pFS->endElementNS(XML_p, XML_showPr);
pFS->endElementNS(XML_p, XML_presentationPr);
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sd/qa sd/source
sd/qa/unit/data/pptx/tdf143126.pptx |binary
sd/qa/unit/export-tests-ooxml1.cxx | 16
sd/source/filter/eppt/pptx-epptooxml.cxx | 29 +++--
3 files changed, 43 insertions(+), 2 deletions(-)
New commits:
commit 9cda220e98acda221b204b49d5d91ce4375cb2a7
Author: Tibor Nagy
AuthorDate: Thu Jul 8 16:12:05 2021 +0200
Commit: Xisco Fauli
CommitDate: Tue Aug 10 09:22:23 2021 +0200
tdf#143126 PPTX: slideshow setting “Start from” not exported
Follow-up to commit 3d55149dcf19cffefcc19c16a3abbe8851453c5e
(tdf#142913 PPTX: slideshow setting “Start from” not imported).
Change-Id: I4124e528f8af61c3b87978c2f3d2b96d983ec056
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118648
Tested-by: Jenkins
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit d2c2985024ee085796a21ef9c3226dde10311c80)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120238
Reviewed-by: Xisco Fauli
diff --git a/sd/qa/unit/data/pptx/tdf143126.pptx
b/sd/qa/unit/data/pptx/tdf143126.pptx
new file mode 100644
index ..f5799b60f26b
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf143126.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx
b/sd/qa/unit/export-tests-ooxml1.cxx
index a450e6d890eb..8c1db529b89c 100644
--- a/sd/qa/unit/export-tests-ooxml1.cxx
+++ b/sd/qa/unit/export-tests-ooxml1.cxx
@@ -117,6 +117,7 @@ public:
void testTdf140865Wordart3D();
void testTdf124457();
void testPlaceholderFillAndOutlineExport();
+void testTdf143126();
CPPUNIT_TEST_SUITE(SdOOXMLExportTest1);
@@ -176,6 +177,7 @@ public:
CPPUNIT_TEST(testTdf140865Wordart3D);
CPPUNIT_TEST(testTdf124457);
CPPUNIT_TEST(testPlaceholderFillAndOutlineExport);
+CPPUNIT_TEST(testTdf143126);
CPPUNIT_TEST_SUITE_END();
@@ -1555,6 +1557,20 @@ void SdOOXMLExportTest1::testTdf124457()
"repeatCount", "indefinite");
}
+void SdOOXMLExportTest1::testTdf143126()
+{
+sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf143126.pptx"),
PPTX);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, );
+xDocShRef->DoClose();
+
+xmlDocUniquePtr pXmlDoc = parseExport(tempFile, "ppt/presProps.xml");
+
+assertXPath(pXmlDoc, "/p:presentationPr/p:showPr", "showNarration", "1");
+assertXPath(pXmlDoc, "/p:presentationPr/p:showPr/p:sldRg", "st", "2" );
+assertXPath(pXmlDoc, "/p:presentationPr/p:showPr/p:sldRg", "end", "3" );
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest1);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index f30a4d040fc6..e9b219bbcd6e 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1067,6 +1067,7 @@ void PowerPointExport::WritePresentationProps()
Reference
xPresentationProps(xPresentationSupplier->getPresentation(),
uno::UNO_QUERY);
bool bEndlessVal =
xPresentationProps->getPropertyValue("IsEndless").get();
+OUString sFirstPage =
xPresentationProps->getPropertyValue("FirstPage").get();
FSHelperPtr pFS = openFragmentStreamWithSerializer(
"ppt/presProps.xml",
@@ -1077,8 +1078,32 @@ void PowerPointExport::WritePresentationProps()
pFS->startElementNS(XML_p, XML_presentationPr, PPRNMSS);
-pFS->singleElementNS(XML_p, XML_showPr, XML_loop,
sax_fastparser::UseIf("1", bEndlessVal),
- XML_showNarration, sax_fastparser::UseIf("1",
bEndlessVal));
+pFS->startElementNS(XML_p, XML_showPr, XML_loop,
sax_fastparser::UseIf("1", bEndlessVal),
+XML_showNarration, "1");
+
+Reference xDPS(mXModel,
uno::UNO_QUERY_THROW);
+Reference xDrawPages(xDPS->getDrawPages(),
uno::UNO_SET_THROW);
+if (!sFirstPage.isEmpty())
+{
+sal_Int32 nStartSlide = 1;
+sal_Int32 nEndSlide = xDrawPages->getCount();
+for (sal_Int32 i = 0; i < nEndSlide; i++)
+{
+Reference xDrawPage;
+xDrawPages->getByIndex(i) >>= xDrawPage;
+Reference xNamed(xDrawPage,
uno::UNO_QUERY_THROW);
+if (xNamed->getName() == sFirstPage)
+{
+nStartSlide = i + 1;
+break;
+}
+}
+
+pFS->singleElementNS(XML_p, XML_sldRg, XML_st,
OUString::number(nStartSlide), XML_end,
+ OUString::number(nEndSlide));
+}
+
+pFS->endElementNS(XML_p, XML_showPr);
pFS->endElementNS(XML_p, XML_presentationPr);
}
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sd/qa sd/source
sd/qa/uitest/impress_tests/customSlideShowDialog.py | 26
sd/source/ui/func/fucushow.cxx |9 --
2 files changed, 32 insertions(+), 3 deletions(-)
New commits:
commit 47b7a76fb011fdd04c3bcbfa555102a422c78638
Author: Tibor Nagy
AuthorDate: Thu Jul 1 16:43:33 2021 +0200
Commit: Xisco Fauli
CommitDate: Mon Jul 19 14:05:19 2021 +0200
tdf#143125 sd: fix crash when closing Custom Slide Shows dialog
regression from commit I6e97a69c546870199d5a45d9a6ad102e30d820c2
Change-Id: I760dabeb024413f1a2aeb57434f63adedb4246f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118231
Tested-by: Jenkins
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit d7dff57384126e50b75c95e84fd3081db2f326a1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119172
Reviewed-by: Xisco Fauli
diff --git a/sd/qa/uitest/impress_tests/customSlideShowDialog.py
b/sd/qa/uitest/impress_tests/customSlideShowDialog.py
new file mode 100644
index ..d0d71cea833d
--- /dev/null
+++ b/sd/qa/uitest/impress_tests/customSlideShowDialog.py
@@ -0,0 +1,26 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+import importlib
+from uitest.debug import sleep
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.common import get_state_as_dict, type_text
+
+class customSlideShowDialog(UITestCase):
+def test_customSlideShowDialog(self):
+self.ui_test.create_doc_in_start_center("impress")
+MainWindow = self.xUITest.getTopFocusWindow()
+TemplateDialog = self.xUITest.getTopFocusWindow()
+cancel = TemplateDialog.getChild("close")
+self.ui_test.close_dialog_through_button(cancel)
+
+self.ui_test.execute_dialog_through_command(".uno:CustomShowDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+
+# Without the fix in place, this test would have crashed here
+self.ui_test.close_dialog_through_button(xDialog.getChild("ok"))
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx
index 8c63d0215776..eb3b12211085 100644
--- a/sd/source/ui/func/fucushow.cxx
+++ b/sd/source/ui/func/fucushow.cxx
@@ -74,10 +74,13 @@ void FuCustomShowDlg::DoExecute( SfxRequest& )
}
if (nRet == RET_OK)
{
-if (!pDlg->IsCustomShow())
+if (mpDoc->GetCustomShowList())
{
-rSettings.mbCustomShow = false;
-rSettings.mbAll = true;
+if (!pDlg->IsCustomShow())
+{
+rSettings.mbCustomShow = false;
+rSettings.mbAll = true;
+}
}
}
pDlg.disposeAndClear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
