[Libreoffice-commits] core.git: filter/source include/filter sd/source

[Andrea Gelmini (via logerrit)]

 filter/source/msfilter/svdfppt.cxx        |    6 +++---
 include/filter/msfilter/svdfppt.hxx       |    2 +-
 sd/source/filter/eppt/epptbase.hxx        |    6 +++---
 sd/source/filter/eppt/pptx-stylesheet.cxx |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 07d99a6315de6453bb94b0afddf921d2e1aba896
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Thu Apr 25 17:16:05 2019 +0200
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Fri Apr 26 07:04:02 2019 +0200

    Fix typo in code
    
    Change-Id: If9e4f46239a42a663a2251aafabfd66268a7c9e3
    Reviewed-on: https://gerrit.libreoffice.org/71315
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Jenkins

diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 5b74dafd011b..d6ad2b72f11c 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1010,8 +1010,8 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, Svx
                 {
                     if ( !rPersistEntry.pPresentationObjects )
                     {
-                        rPersistEntry.pPresentationObjects.reset( new sal_uInt32[ PPT_STYLESHEETENTRYS ] );
-                        memset( rPersistEntry.pPresentationObjects.get(), 0, PPT_STYLESHEETENTRYS * 4 );
+                        rPersistEntry.pPresentationObjects.reset( new sal_uInt32[ PPT_STYLESHEETENTRIES ] );
+                        memset( rPersistEntry.pPresentationObjects.get(), 0, PPT_STYLESHEETENTRIES * 4 );
                     }
                     if ( !rPersistEntry.pPresentationObjects[ static_cast<int>(nDestinationInstance) ] )
                         rPersistEntry.pPresentationObjects[ static_cast<int>(nDestinationInstance) ] = rObjData.rSpHd.GetRecBegFilePos();
@@ -3331,7 +3331,7 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const
             {
                 case PPT_PST_ExtendedParagraphMasterAtom :
                 {
-                    if ( aHd.nRecInstance < PPT_STYLESHEETENTRYS )
+                    if ( aHd.nRecInstance < PPT_STYLESHEETENTRIES )
                     {
                         sal_uInt16 nDepth = 0, i = 0;
                         rSt.ReadUInt16(nDepth);
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index b55458f94f6e..c378a10ebb6f 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -688,7 +688,7 @@ struct  PPTTextSpecInfoAtomInterpreter
 
 };
 
-#define PPT_STYLESHEETENTRYS    9
+#define PPT_STYLESHEETENTRIES    9
 
 struct PPTExtParaLevel
 {
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index 39598f2780bc..349db840e633 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -200,7 +200,7 @@ private:
     std::vector<FontCollectionEntry> maFonts;
 };
 
-#define PPTEX_STYLESHEETENTRYS  9
+#define PPTEX_STYLESHEETENTRIES  9
 
 enum PPTExTextAttr
 {
@@ -302,8 +302,8 @@ class PPTExStyleSheet
 
     public:
 
-                std::unique_ptr<PPTExCharSheet>  mpCharSheet[ PPTEX_STYLESHEETENTRYS ];
-                std::unique_ptr<PPTExParaSheet>  mpParaSheet[ PPTEX_STYLESHEETENTRYS ];
+                std::unique_ptr<PPTExCharSheet>  mpCharSheet[ PPTEX_STYLESHEETENTRIES ];
+                std::unique_ptr<PPTExParaSheet>  mpParaSheet[ PPTEX_STYLESHEETENTRIES ];
 
                 PPTExStyleSheet( sal_uInt16 nDefaultTab, PPTExBulletProvider* pBuProv );
                 ~PPTExStyleSheet();
diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx
index a9caf39b8721..4057458c8ee3 100644
--- a/sd/source/filter/eppt/pptx-stylesheet.cxx
+++ b/sd/source/filter/eppt/pptx-stylesheet.cxx
@@ -411,7 +411,7 @@ void PPTExStyleSheet::SetStyleSheet( const css::uno::Reference< css::beans::XPro
 
 bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, PPTExTextAttr eAttr, sal_uInt32 nValue )
 {
-    assert(nInstance < PPTEX_STYLESHEETENTRYS && nLevel < 5);
+    assert(nInstance < PPTEX_STYLESHEETENTRIES && nLevel < 5);
 
     const PPTExParaLevel& rPara = mpParaSheet[ nInstance ]->maParaLevel[ nLevel ];
     const PPTExCharLevel& rChar = mpCharSheet[ nInstance ]->maCharLevel[ nLevel ];