core.git: sd/source writerfilter/source

[Justin Luth (via logerrit)]

 sd/source/ui/dlg/headerfooterdlg.cxx          |    2 +-
 writerfilter/source/dmapper/GraphicImport.cxx |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 99e33129346afeb0a386ffad859a9178290211a6
Author:     Justin Luth <justin.l...@collabora.com>
AuthorDate: Thu Feb 29 11:35:43 2024 -0500
Commit:     Justin Luth <jl...@mail.com>
CommitDate: Fri Mar 1 01:39:18 2024 +0100

    NFC writerfilter GraphicImport: streamline if statement
    
    The function is a const static, so it doesn't require being run.
    
    Change-Id: I31fb35e9daf54103071197e669c54818d4062264
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164172
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <jl...@mail.com>

diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx 
b/sd/source/ui/dlg/headerfooterdlg.cxx
index 92f7e9be1cb0..8aaf7fed1e47 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -536,7 +536,7 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( 
LanguageType &rLanguage, boo
     }
     else
     {
-        const sal_uInt16 nPageCount = 
mpDoc->GetMasterSdPageCount(PageKind::Standard);
+        const sal_uInt16 nPageCount = 1;// 
mpDoc->GetMasterSdPageCount(PageKind::Standard);
         sal_uInt16 nPage;
         for( nPage = 0; nPage < nPageCount; nPage++ )
         {
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index f64bef09e958..a2acdeb604cc 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -972,8 +972,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue)
                             && !bIsDiagram && !bIsLockedCanvas && 
!bIsWordprocessingCanvas)
                             || 
xServiceInfo->supportsService("com.sun.star.drawing.LineShape");
                         SdrObject* pShape = 
SdrObject::getSdrObjectFromXShape(m_xShape);
-                        if ((bIsGroupOrLine && 
!lcl_bHasGroupSlantedChild(pShape) && nOOXAngle == 0)
-                            || !bIsGroupOrLine)
+                        if (!bIsGroupOrLine || (!nOOXAngle && 
!lcl_bHasGroupSlantedChild(pShape)))
                         {
                             if (m_pImpl->isXSizeValid())
                                 aSize.Width = m_pImpl->getXSize();