[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/svx-ppt-bullet-offset-fix.diff |   22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

New commits:
commit 36b1d63dc8abf581f71fc28e43c447c83af98a70
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Apr 7 14:18:18 2011 +0300

    Make svx-ppt-bullet-offset-fix.diff apply again

diff --git a/patches/dev300/svx-ppt-bullet-offset-fix.diff b/patches/dev300/svx-ppt-bullet-offset-fix.diff
index 7d1fc1e..9a4d8a3 100644
--- a/patches/dev300/svx-ppt-bullet-offset-fix.diff
+++ b/patches/dev300/svx-ppt-bullet-offset-fix.diff
@@ -1,20 +1,13 @@
----
- filter/source/msfilter/msdffimp.cxx |   15 +++++++++++----
- filter/source/msfilter/svdfppt.cxx  |   15 +++++++++++++++
- 2 files changed, 26 insertions(+), 4 deletions(-)
-
-diff --git filter/source/msfilter/msdffimp.cxx filter/source/msfilter/msdffimp.cxx
-index ca3a353..ff1ce87 100644
 --- filter/source/msfilter/msdffimp.cxx
 +++ filter/source/msfilter/msdffimp.cxx
 @@ -4161,18 +4161,25 @@ FASTBOOL SvxMSDffManager::ReadObjText(SvStream& rSt, SdrObject* pObj) const
-                             UINT16 nLen = (UINT16)aHd.nRecLen;
+                             sal_uInt16 nLen = (sal_uInt16)aHd.nRecLen;
                              if(nLen)
                              {
-+                UINT32 nMask;
-                                 UINT16 nVal1, nVal2, nVal3;
-                                 UINT16 nDefaultTab = 2540; // PPT def: 1 Inch //rOutliner.GetDefTab();
-                                 UINT16 nMostrightTab = 0;
++                sal_uInt32 nMask;
+                                 sal_uInt16 nVal1, nVal2, nVal3;
+                                 sal_uInt16 nDefaultTab = 2540; // PPT def: 1 Inch //rOutliner.GetDefTab();
+                                 sal_uInt16 nMostrightTab = 0;
                                  SfxItemSet aSet(rOutliner.GetEmptyItemSet());
                                  SvxTabStopItem aTabItem(0, 0, SVX_TAB_ADJUST_DEFAULT, EE_PARA_TABS);
  
@@ -45,8 +38,6 @@ index ca3a353..ff1ce87 100644
                                  {
                                      rSt >> nVal1;
                                      nLen -= 2;
-diff --git filter/source/msfilter/svdfppt.cxx filter/source/msfilter/svdfppt.cxx
-index 0224cdc..c27e196 100644
 --- filter/source/msfilter/svdfppt.cxx
 +++ filter/source/msfilter/svdfppt.cxx
 @@ -4775,6 +4775,10 @@ PPTTextRulerInterpreter::PPTTextRulerInterpreter( UINT32 nFileOfs, SdrPowerPoint
@@ -78,6 +69,3 @@ index 0224cdc..c27e196 100644
              }
          }
          rIn.Seek( nOldPos );
--- 
-1.7.0.1
-