[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sd/source

[Noel Grandin (via logerrit)]

 sd/source/filter/eppt/pptx-epptooxml.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9ce5536514646b364f07ff7e124e90444bdf7b32
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Jun 17 15:47:59 2021 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Wed Jun 23 23:33:11 2021 +0200

    avoid maybe-uninitialized in PowerPointShapeExport
    
    /home/noel/libo3/sd/source/filter/eppt/pptx-epptooxml.cxx: In member
    function ‘oox::drawingml::ShapeExport&
    oox::core::PowerPointShapeExport::WritePlaceholderReferenceTextBody(oox::core::PlaceholderType,
    PageType,
    com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>)’:
    /home/noel/libo3/sd/source/filter/eppt/pptx-epptooxml.cxx:1715:31:
    error: ‘nDateTimeFormat’ may be used uninitialized in this function
    [-Werror=maybe-uninitialized]
    1715 |                 SvxTimeFormat eTime =
    static_cast<SvxTimeFormat>(nDateTimeFormat >> 4);
          |                               ^~~~~
    /home/noel/libo3/sd/source/filter/eppt/pptx-epptooxml.cxx:1707:36:
    error: ‘bIsDateTimeFixed’ may be used uninitialized in this function
    [-Werror=maybe-uninitialized]
     1707 |             if(ePageType != LAYOUT && !bIsDateTimeFixed)
          |                ~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~
    
    Change-Id: I7f622321680705fb0b0fa42630949c8d6af8488e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117398
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 3c24e7ed972ae2fc431365e4884e27c0b243c905)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117716
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index e9b7e7a6dddd..e3619e8ce96b 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1610,12 +1610,12 @@ ShapeExport& PowerPointShapeExport::WritePlaceholderReferenceTextBody(
         case DateAndTime:
         {
             OUString aDateTimeType = "datetime1";
-            bool bIsDateTimeFixed;
+            bool bIsDateTimeFixed = false;
             xPagePropSet->getPropertyValue("IsDateTimeFixed") >>= bIsDateTimeFixed;
 
             if(ePageType != LAYOUT && !bIsDateTimeFixed)
             {
-                sal_Int32 nDateTimeFormat;
+                sal_Int32 nDateTimeFormat = 0;
                 xPagePropSet->getPropertyValue("DateTimeFormat") >>= nDateTimeFormat;
 
                 // 4 LSBs represent the date