[Libreoffice-commits] core.git: lotuswordpro/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Fri Jan 3 21:00:12 UTC 2020


 lotuswordpro/source/filter/lwpparastyle.cxx |    2 +-
 lotuswordpro/source/filter/lwptabrack.hxx   |   10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 80fd15abe368627c7d5f385e178d94ee67eaafe6
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jan 3 17:07:08 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jan 3 21:59:25 2020 +0100

    ofz#19786 Invalid-enum-value
    
    Change-Id: I9bca61f728877b6f7a741e9d89ad2f7f5ae0eb61
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86197
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx
index f7fc6979746d..e52909e3b361 100644
--- a/lotuswordpro/source/filter/lwpparastyle.cxx
+++ b/lotuswordpro/source/filter/lwpparastyle.cxx
@@ -597,7 +597,7 @@ void LwpParaStyle::ApplyTab(XFParaStyle *pParaStyle, LwpTabOverride *pTabOverRid
             return;
 
         enumXFTab eType = enumXFTabNone;
-        LwpTab::TabType type = pTab->GetTabType();
+        sal_uInt32 type = pTab->GetTabType();
         switch(type)
         {
         case LwpTab::TT_LEFT:
diff --git a/lotuswordpro/source/filter/lwptabrack.hxx b/lotuswordpro/source/filter/lwptabrack.hxx
index d29aaada28f9..1f038e61ffd7 100644
--- a/lotuswordpro/source/filter/lwptabrack.hxx
+++ b/lotuswordpro/source/filter/lwptabrack.hxx
@@ -96,7 +96,10 @@ public:
 public:
     void    Read(LwpObjectStream *pStrm);
     inline sal_uInt32 GetPosition() const;
-    inline TabType GetTabType() const;
+    sal_uInt8 GetTabType() const
+    {
+        return m_nType;
+    }
     inline LeaderType GetLeaderType() const;
     inline sal_uInt16 GetAlignChar() const;
 
@@ -113,11 +116,6 @@ inline sal_uInt32 LwpTab::GetPosition() const
     return m_nX;
 }
 
-inline LwpTab::TabType LwpTab::GetTabType() const
-{
-    return static_cast<LwpTab::TabType>(m_nType);
-}
-
 inline LwpTab::LeaderType LwpTab::GetLeaderType() const
 {
     return static_cast<LwpTab::LeaderType>(m_nLeader);


More information about the Libreoffice-commits mailing list