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

[Tor Lillqvist]

 patches/dev300/sd-custom-show-fix.diff                          |   11 ------
 patches/dev300/svx-hacky-htmlselect-control-import.diff         |   17 +---------
 patches/dev300/sw-nested-positionned-tables-ww8-import-fix.diff |   11 ------
 3 files changed, 5 insertions(+), 34 deletions(-)

New commits:
commit c30b9ee7dfd52789460ac39c046a0b82ce9afd4c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 5 12:55:01 2011 +0300

    Make sw-nested-positionned-tables-ww8-import-fix.diff apply again

diff --git a/patches/dev300/sw-nested-positionned-tables-ww8-import-fix.diff b/patches/dev300/sw-nested-positionned-tables-ww8-import-fix.diff
index 2fe086c..f5530b0 100644
--- a/patches/dev300/sw-nested-positionned-tables-ww8-import-fix.diff
+++ b/patches/dev300/sw-nested-positionned-tables-ww8-import-fix.diff
@@ -1,9 +1,3 @@
----
- sw/source/filter/ww8/ww8par.cxx |   10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx
-index 1101227..e89e330 100644
 --- sw/source/filter/ww8/ww8par.cxx
 +++ sw/source/filter/ww8/ww8par.cxx
 @@ -2075,6 +2075,8 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp)
@@ -16,7 +10,7 @@ index 1101227..e89e330 100644
      WW8_TablePos aTabPos;
      if (nCellLevel && !bVer67)
 @@ -2088,7 +2090,7 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp)
-         if (const BYTE *pLevel = pPlcxMan->HasParaSprm(0x6649))
+         if (const sal_uInt8 *pLevel = pPlcxMan->HasParaSprm(0x6649))
              nCellLevel = *pLevel;
  
 -        bool bHasRowEnd = SearchRowEnd(pPap, nMyStartCp, nCellLevel-1);
@@ -42,6 +36,3 @@ index 1101227..e89e330 100644
          }
          // nach StartTable ist ein ReSync noetig ( eigentlich nur, falls die
          // Tabelle ueber eine FKP-Grenze geht
--- 
-1.7.0.1
-
commit eccf6a11d1717dedbf6550eafc22a51ce82154e0
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 5 12:53:22 2011 +0300

    Make sd-custom-show-fix.diff apply again

diff --git a/patches/dev300/sd-custom-show-fix.diff b/patches/dev300/sd-custom-show-fix.diff
index 0f4856f..4049572 100644
--- a/patches/dev300/sd-custom-show-fix.diff
+++ b/patches/dev300/sd-custom-show-fix.diff
@@ -1,15 +1,9 @@
----
- sd/source/ui/slideshow/slideshowimpl.cxx |    4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git sd/source/ui/slideshow/slideshowimpl.cxx sd/source/ui/slideshow/slideshowimpl.cxx
-index 61c6559..9e987ff 100755
 --- sd/source/ui/slideshow/slideshowimpl.cxx
 +++ sd/source/ui/slideshow/slideshowimpl.cxx
 @@ -2693,9 +2693,7 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons
              for( pCustomSlide = pCustomShow->First(),nSlideIndex=0; pCustomSlide; pCustomSlide = pCustomShow->Next(), nSlideIndex++ )
              {
-                 const USHORT nSdSlide = ( ( (SdPage*) pCustomSlide )->GetPageNum() - 1 ) / 2;
+                 const sal_uInt16 nSdSlide = ( ( (SdPage*) pCustomSlide )->GetPageNum() - 1 ) / 2;
 -
 -                if( !( mpDoc->GetSdPage( nSdSlide, PK_STANDARD ) )->IsExcluded())
 -                    mpSlideController->insertSlideNumber( nSdSlide );
@@ -17,6 +11,3 @@ index 61c6559..9e987ff 100755
              }
          }
      }
--- 
-1.7.0.1
-
commit d7ae42ca9f0859cc5109c5fd2746c96be22249f5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 5 12:51:03 2011 +0300

    Make svx-hacky-htmlselect-control-import.diff apply again

diff --git a/patches/dev300/svx-hacky-htmlselect-control-import.diff b/patches/dev300/svx-hacky-htmlselect-control-import.diff
index 851b989..a745bcf 100644
--- a/patches/dev300/svx-hacky-htmlselect-control-import.diff
+++ b/patches/dev300/svx-hacky-htmlselect-control-import.diff
@@ -1,10 +1,3 @@
----
- filter/inc/filter/msfilter/msocximex.hxx |   35 ++++++++
- filter/source/msfilter/msocximex.cxx     |  139 ++++++++++++++++++++++++++++++
- 2 files changed, 174 insertions(+), 0 deletions(-)
-
-diff --git filter/inc/filter/msfilter/msocximex.hxx filter/inc/filter/msfilter/msocximex.hxx
-index c50c5a4..2ab137c 100644
 --- filter/inc/filter/msfilter/msocximex.hxx
 +++ filter/inc/filter/msfilter/msocximex.hxx
 @@ -1417,6 +1417,41 @@ public:
@@ -49,8 +42,6 @@ index c50c5a4..2ab137c 100644
  
  class HTML_TextBox : public OCX_ModernControl
  {
-diff --git filter/source/msfilter/msocximex.cxx filter/source/msfilter/msocximex.cxx
-index 174781a..5860556 100644
 --- filter/source/msfilter/msocximex.cxx
 +++ filter/source/msfilter/msocximex.cxx
 @@ -4446,6 +4446,8 @@ OCX_map aOCXTab[] =
@@ -62,7 +53,7 @@ index 174781a..5860556 100644
  };
  
  const int NO_OCX = sizeof( aOCXTab ) / sizeof( *aOCXTab );
-@@ -5239,6 +5241,143 @@ sal_Bool HTML_TextBox::ReadFontData(SotStorageStream *pS)
+@@ -5239,6 +5241,144 @@ sal_Bool HTML_TextBox::ReadFontData(SotStorageStream *pS)
    return sal_True;
  }
  
@@ -203,9 +194,7 @@ index 174781a..5860556 100644
 +    return sal_True;
 +}
 +
- 
++
  // Doesn't really read anything but just skips the
  // record.
--- 
-1.7.0.1
-
+ sal_Bool OCX_TabStrip::Read(SotStorageStream *pS)