[Libreoffice-commits] core.git: 2 commits - oox/source sd/source

[Marco Cecchetti (via logerrit)]

 oox/source/export/drawingml.cxx  |    4 ++++
 sd/source/ui/unoidl/unomodel.cxx |    3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 4c7e8b3593c6311375603616c8d5bbd8ce5022f5
Author:     Marco Cecchetti <marco.cecche...@collabora.com>
AuthorDate: Wed Jun 14 12:42:22 2023 +0200
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Oct 11 09:31:31 2023 +0200

    fixup for: fe79008f70e7 sd: send correct slide visibility status
    
    Check pointer to be vaild
    
    Change-Id: Id7be4756496f034c4a6a4407cb625e68a66573c6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153051
    Reviewed-by: Gökay ŞATIR <gokaysa...@collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    (cherry picked from commit 93a28b3bc8a50226a111464b08ac51d1feb05988)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157761
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index f5a7f112ca6e..c087ade87b5e 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2369,7 +2369,8 @@ OUString SdXImpressDocument::getPartInfo(int nPart)
     if (!pViewSh)
         return OUString();
 
-    const bool bIsVisible = !pViewSh->GetDoc()->GetSdPage(nPart, 
pViewSh->GetPageKind())->IsExcluded();
+    const SdPage* pSdPage = mpDoc->GetSdPage(nPart, pViewSh->GetPageKind());
+    const bool bIsVisible = pSdPage && !pSdPage->IsExcluded();
     const bool bIsSelected = pViewSh->IsSelected(nPart);
     const sal_Int16 nMasterPageCount= 
pViewSh->GetDoc()->GetMasterSdPageCount(pViewSh->GetPageKind());
 
commit 60a51b8397154e9685e63cff0a60c1a3da034423
Author:     Darshan-upadhyay1110 <darshan.upadh...@collabora.com>
AuthorDate: Tue Sep 26 12:29:15 2023 +0530
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Oct 11 09:31:17 2023 +0200

    tdf#51510 Blurry QR code after save/reload (docx)
    
    - without GfxLinkType::NativeSvg CASE in writeToStorage method by default 
QR svg changes to low resolution image type and that is the why QR got blurry 
in doc or docx format
    - added svg option when we change from odt to doc or docx format
    
    
    Change-Id: I74aec0619992c1f455cc9cbf3c19e352c3037e04
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157264
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
    Tested-by: Szymon Kłos <szymon.k...@collabora.com>
    (cherry picked from commit 1d7dc53f19d188ae12603ca3cd526eb0a5016cf4)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157729
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 0d1b8a5e1eda..ebe1df3a72d8 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1442,6 +1442,10 @@ OUString GraphicExport::writeToStorage(const Graphic& 
rGraphic , bool bRelPathTo
                 sMediaType = "image/png";
                 pExtension = ".png";
                 break;
+            case GfxLinkType::NativeSvg:
+                sMediaType = "image/svg";
+                pExtension = ".svg";
+                break;
             case GfxLinkType::NativeTif:
                 sMediaType = "image/tiff";
                 pExtension = ".tif";