Attachment 108711 Details for Bug 79082 – Proposed patch

[patch] Proposed patch

svdfppt.patch (text/plain), 2.15 KB, created by Piet van Oostrum on 2014-10-31 00:27:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piet van Oostrum

Created: 2014-10-31 00:27:54 UTC

Size: 2.15 KB

patch

obsolete

>diff -c /Users/piet/Downloads/LibreOffice/libreoffice-4.3.2.2/filter/source/msfilter/svdfppt.cxx.orig /Users/piet/Downloads/LibreOffice/libreoffice-4.3.2.2/filter/source/msfilter/svdfppt.cxx
>*** /Users/piet/Downloads/LibreOffice/libreoffice-4.3.2.2/filter/source/msfilter/svdfppt.cxx.orig	2014-09-16 22:10:41.000000000 +0200
>--- /Users/piet/Downloads/LibreOffice/libreoffice-4.3.2.2/filter/source/msfilter/svdfppt.cxx	2014-10-30 22:57:03.000000000 +0100
>***************
>*** 5658,5664 ****
>      PPTNumberFormatCreator  ( NULL ),
>      mrStyleSheet            ( rStyleSheet ),
>      mnInstance              ( nInstance ),
>-     mbTab                   ( true ),      // style sheets always have to get the right tabulator setting
>      mnCurrentObject         ( 0 )
>  {
>      if ( nDepth > 4 )
>--- 5658,5663 ----
>***************
>*** 5675,5681 ****
>      PPTTextRulerInterpreter ( rRuler ),
>      mrStyleSheet            ( rStyleSheet ),
>      mnInstance              ( nInstance ),
>-     mbTab                   ( false ),
>      mnCurrentObject         ( 0 )
>  {
>      if (rnCurCharPos < rPropReader.aCharPropList.size())
>--- 5674,5679 ----
>***************
>*** 5691,5700 ****
>              PPTPortionObj* pPPTPortion = new PPTPortionObj( *pCharPropSet,
>                      rStyleSheet, nInstance, pParaSet->mnDepth );
>              m_PortionList.push_back(pPPTPortion);
>-             if (!mbTab)
>-             {
>-                 mbTab = pPPTPortion->HasTabulator();
>-             }
>          }
>      }
>  }
>--- 5689,5694 ----
>***************
>*** 5707,5716 ****
>  void PPTParagraphObj::AppendPortion( PPTPortionObj& rPPTPortion )
>  {
>      m_PortionList.push_back(new PPTPortionObj(rPPTPortion));
>-     if ( !mbTab )
>-     {
>-         mbTab = m_PortionList.back().HasTabulator();
>-     }
>  }
>  
>  void PPTParagraphObj::UpdateBulletRelSize( sal_uInt32& nBulletRelSize ) const
>--- 5701,5706 ----
>***************
>*** 6157,6163 ****
>          rSet.Put( aULSpaceItem );
>      }
>  
>-     if ( mbTab )    // makes it sense to apply tabsettings
>      {
>          sal_uInt32 i, nDefaultTab, nTab, nTextOfs2 = 0;
>          sal_uInt32 nLatestManTab = 0;
>--- 6147,6152 ----
>
>Diff finished.  Fri Oct 31 01:24:28 2014

Actions: View | Splinter Review

Attachments on bug 79082: 99595 | 106377 | 108711

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.