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

[Piet van Oostrum (via logerrit)]

 filter/source/msfilter/svdfppt.cxx  |   13 -------------
 include/filter/msfilter/svdfppt.hxx |    3 ---
 2 files changed, 16 deletions(-)

New commits:
commit 070f44e3b2d7dcf26de68ee46c50dad5c0cf2170
Author:     Piet van Oostrum <piet at vanoostrum.org>
AuthorDate: Thu Nov 26 18:37:56 2015 +0400
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Mon May 4 10:34:30 2020 +0200

    tdf#79082 Correctly import PPT tabs
    
    Change-Id: I7ac5ccb356501983da645f0a6037b5292ce8b5b4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/20207
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Jenkins

diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 3316fa67faf0..c36d865ccbe0 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -5816,7 +5816,6 @@ PPTParagraphObj::PPTParagraphObj( const PPTStyleSheet& rStyleSheet, TSS_Type nIn
     PPTNumberFormatCreator  ( nullptr ),
     mrStyleSheet            ( rStyleSheet ),
     mnInstance              ( nInstance ),
-    mbTab                   ( true ),      // style sheets always have to get the right tabulator setting
     mnCurrentObject         ( 0 )
 {
     mxParaSet->mnDepth = sanitizeForMaxPPTLevels(nDepth);
@@ -5831,7 +5830,6 @@ PPTParagraphObj::PPTParagraphObj( PPTStyleTextPropReader& rPropReader,
     PPTTextRulerInterpreter ( rRuler ),
     mrStyleSheet            ( rStyleSheet ),
     mnInstance              ( nInstance ),
-    mbTab                   ( false ),
     mnCurrentObject         ( 0 )
 {
     if (rnCurCharPos >= rPropReader.aCharPropList.size())
@@ -5847,10 +5845,6 @@ PPTParagraphObj::PPTParagraphObj( PPTStyleTextPropReader& rPropReader,
             rPropReader.aCharPropList[rnCurCharPos].get();
         std::unique_ptr<PPTPortionObj> pPPTPortion(new PPTPortionObj(
                 *pCharPropSet, rStyleSheet, nInstance, mxParaSet->mnDepth));
-        if (!mbTab)
-        {
-            mbTab = pPPTPortion->HasTabulator();
-        }
         m_PortionList.push_back(std::move(pPPTPortion));
     }
 }
@@ -5863,10 +5857,6 @@ void PPTParagraphObj::AppendPortion( PPTPortionObj& rPPTPortion )
 {
     m_PortionList.push_back(
             std::make_unique<PPTPortionObj>(rPPTPortion));
-    if ( !mbTab )
-    {
-        mbTab = m_PortionList.back()->HasTabulator();
-    }
 }
 
 void PPTParagraphObj::UpdateBulletRelSize( sal_uInt32& nBulletRelSize ) const
@@ -6311,9 +6301,6 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet,  std::optional< sal_Int16 >& rS
         rSet.Put( aULSpaceItem );
     }
 
-    if ( !mbTab )    // makes it sense to apply tabsettings
-        return;
-
     sal_uInt32 i, nDefaultTab, nTab, nTextOfs2 = 0;
     sal_uInt32 nLatestManTab = 0;
     GetAttrib( PPT_ParaAttr_TextOfs, nTextOfs2, nDestinationInstance );
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index eb54305fa968..f507669e58ca 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -1146,9 +1146,6 @@ class MSFILTER_DLLPUBLIC PPTParagraphObj
     void operator=(PPTParagraphObj const&) = delete;
 
 public:
-
-    bool                    mbTab;          // if true, this paragraph has tabulators in text
-
     sal_uInt32              mnCurrentObject;
     ::std::vector<std::unique_ptr<PPTPortionObj>> m_PortionList;