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

[Petr Mladek]

 patches/dev300/apply                          |    3 -
 patches/dev300/svx-ppt-bullet-offset-fix.diff |   71 --------------------------
 2 files changed, 74 deletions(-)

New commits:
commit 98a0af787e108c8fb464eacf4c271015057ce8c0
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Apr 29 17:13:00 2011 +0200

    pushed svx-ppt-bullet-offset-fix.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 69081ca..9b2970f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1475,9 +1475,6 @@ build-sled10-autoconf.diff
 #       boost.m4 can't be procced by it
 build-sled10-ixion-with-internal-boost.diff
 
-[ Fixes ]
-svx-ppt-bullet-offset-fix.diff, n#593609, rodo
-
 [ GSoC2010 ]
 # Patches from GSoC 2010 students.
 online_gallery.diff, tijana
diff --git a/patches/dev300/svx-ppt-bullet-offset-fix.diff b/patches/dev300/svx-ppt-bullet-offset-fix.diff
deleted file mode 100644
index 9a4d8a3..0000000
--- a/patches/dev300/svx-ppt-bullet-offset-fix.diff
+++ /dev/null
@@ -1,71 +0,0 @@
---- filter/source/msfilter/msdffimp.cxx
-+++ filter/source/msfilter/msdffimp.cxx
-@@ -4161,18 +4161,25 @@ FASTBOOL SvxMSDffManager::ReadObjText(SvStream& rSt, SdrObject* pObj) const
-                             sal_uInt16 nLen = (sal_uInt16)aHd.nRecLen;
-                             if(nLen)
-                             {
-+                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);
- 
--                                rSt >> nVal1;
--                                rSt >> nVal2;
-+                                rSt >> nMask;
-                                 nLen -= 4;
- 
-+                                if(nLen && (nMask & 0x0002))
-+                {
-+                    // number of indent levels
-+                    rSt >> nVal3;
-+                                    nLen -= 2;
-+                }
-+
-                                 // Allg. TAB verstellt auf Wert in nVal3
--                                if(nLen && (nVal1 & 0x0001))
-+                                if(nLen && (nMask & 0x0001))
-                                 {
-                                     rSt >> nVal3;
-                                     nLen -= 2;
-@@ -4180,7 +4187,7 @@ FASTBOOL SvxMSDffManager::ReadObjText(SvStream& rSt, SdrObject* pObj) const
-                                 }
- 
-                                 // Weitere, frei gesetzte TABs
--                                if(nLen && (nVal1 & 0x0004))
-+                                if(nLen && (nMask & 0x0004))
-                                 {
-                                     rSt >> nVal1;
-                                     nLen -= 2;
---- filter/source/msfilter/svdfppt.cxx
-+++ filter/source/msfilter/svdfppt.cxx
-@@ -4775,6 +4775,10 @@ PPTTextRulerInterpreter::PPTTextRulerInterpreter( UINT32 nFileOfs, SdrPowerPoint
-             sal_Int16	nTCount;
-             sal_Int32	i;
-             rIn >> mpImplRuler->nFlags;
-+
-+        // number of indent levels, unused now
-+            if ( mpImplRuler->nFlags & 2 )
-+                rIn >> nTCount;
-             if ( mpImplRuler->nFlags & 1 )
-                 rIn >> mpImplRuler->nDefaultTab;
-             if ( mpImplRuler->nFlags & 4 )
-@@ -4797,6 +4801,17 @@ PPTTextRulerInterpreter::PPTTextRulerInterpreter( UINT32 nFileOfs, SdrPowerPoint
-                     rIn >> mpImplRuler->nTextOfs[ i ];
-                 if ( mpImplRuler->nFlags & ( 256 << i ) )
-                     rIn >> mpImplRuler->nBulletOfs[ i ];
-+        if( mpImplRuler->nBulletOfs[ i ] > 0x7fff) {
-+            // workaround
-+            // when bullet offset is > 0x7fff, the paragraph should look like
-+            // *    first line text
-+            // second line text
-+            //
-+            // we add to bullet para indent 0xffff - bullet offset. it looks like
-+            // best we can do for now
-+            mpImplRuler->nTextOfs[ i ] += 0xffff - mpImplRuler->nBulletOfs[ i ];
-+            mpImplRuler->nBulletOfs[ i ] = 0;
-+        }
-             }
-         }
-         rIn.Seek( nOldPos );