sd/source/core/drawdoc2.cxx | 3 ++- sd/source/ui/inc/ViewShell.hxx | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-)
New commits: commit fbfd0848af043530e07ffda51f640425dd3158ac Author: Mohit Marathe <[email protected]> AuthorDate: Tue Dec 9 12:06:13 2025 +0530 Commit: Mohit Marathe <[email protected]> CommitDate: Tue Jan 13 09:04:17 2026 +0100 sd: better default zoom for canvas and non-canvas pages Signed-off-by: Mohit Marathe <[email protected]> Change-Id: Ia20643ec4a39730cbc2295d7818cfc80d0ece54a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195266 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196814 Tested-by: Jenkins diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index aae2e4d17a15..7920e7434739 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -487,8 +487,8 @@ protected: sal_uInt16 mnPrintedHandoutPageNum; // Page number of the handout page that is to be printed. sal_uInt16 mnPrintedHandoutPageCount; // Page count of the handout pages that are to be printed. - sal_uInt16 mnCanvasPageZoom = 0; - sal_uInt16 mnNonCanvasPageZoom = 0; + sal_uInt16 mnCanvasPageZoom = 20; + sal_uInt16 mnNonCanvasPageZoom = 100; //af bool bPrintDirectSelected; // Print only selected objects in direct print //afString sPageRange; // pagerange if selected objects in direct print commit 7f6859fa3bc75d8a482ac8a051d7c8751c500a0f Author: Mohit Marathe <[email protected]> AuthorDate: Thu Dec 4 18:07:11 2025 +0530 Commit: Mohit Marathe <[email protected]> CommitDate: Tue Jan 13 09:04:02 2026 +0100 sd: fix remove page logic for non-canvas page regression from b058526f16724d72f87810c438ac0cccb2ca16ff Signed-off-by: Mohit Marathe <[email protected]> Change-Id: I9dc939239ec9683680f5541ded77958d46a486b8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194996 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196813 Tested-by: Jenkins diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 0e660e82c361..e384e2a4591d 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -505,7 +505,8 @@ void SdDrawDocument::DeletePage(sal_uInt16 nPgNum) rtl::Reference<SdrPage> SdDrawDocument::RemovePage(sal_uInt16 nPgNum) { // Do not remove the only non-canvas page - if (HasCanvasPage() && GetSdPageCount(PageKind::Standard) == 2) + if (HasCanvasPage() && GetSdPageCount(PageKind::Standard) == 2 + && nPgNum == 3) return nullptr; rtl::Reference<SdrPage> pPage = FmFormModel::RemovePage(nPgNum);
