sd/source/filter/eppt/pptx-epptbase.cxx | 9 +++++++++ 1 file changed, 9 insertions(+)
New commits: commit 1098e5d948f93cb3541dde9652324f6fd911d79f Author: Mohit Marathe <[email protected]> AuthorDate: Tue Nov 25 15:52:53 2025 +0530 Commit: Michael Stahl <[email protected]> CommitDate: Mon Jan 12 19:29:01 2026 +0100 sd: do not export canvas slide to pptx by decreasing the page count by 1. As the canvas page and its notes page is always at the end, `PPTWriterBase::CreateSlide` and `PPTWriterBase::CreateNotes` won't be called for them. The same cannot be done for the master canvas page as its not necessarily the last master page. Since that master page will be unused, it is safe to export that. Signed-off-by: Mohit Marathe <[email protected]> Change-Id: Ie24f594d45c08a99548363cc1e20cfff977ce519 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194521 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> Code-Style: Michael Stahl <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196807 Tested-by: Jenkins diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index b1eb2675b944..06589c35561f 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -17,9 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <comphelper/servicehelper.hxx> +#include <drawdoc.hxx> #include "epptbase.hxx" #include "epptdef.hxx" #include "../ppt/pptanimations.hxx" +#include <unomodel.hxx> #include <o3tl/any.hxx> #include <vcl/outdev.hxx> @@ -231,6 +234,12 @@ bool PPTWriterBase::InitSOIface() if ( !GetPageByIndex( 0, NORMAL ) ) break; + if (mXModel.is()) + { + SdDrawDocument* pDoc = mXModel->GetDoc(); + if (pDoc && pDoc->HasCanvasPage()) + mnPages--; + } return true; } return false;
