Fixes for n#417814 and n#417818.

* patches/dev300/apply:
* patches/dev300/svtools-svrtf-token-ignore-case.diff:
* patches/dev300/sw-invert-border-spacing.diff:
* patches/dev300/sw-table-join-fix-i99267.diff:

4 files changed, 80 insertions, 30 deletions

diff --git a/patches/dev300/apply b/patches/dev300/apply
index d4448d780..96f27a21e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2774,12 +2774,13 @@ solenv-installer-unopkg-call.diff, thorsten
 svx-debug-sdrolestreams.diff, thorsten
 instset-macos-langpacks.diff, i#64937, cloph
 sal-disable-backtrace.diff, thorsten
-# FIXME 2008-11-26:
-#sw-invert-border-spacing.diff, n#391591, flr
+sw-invert-border-spacing.diff, n#391591, flr
 cws-impress162-sd.diff, i#94193, thorsten
 cws-impress162-canvas.diff, i#94193, thorsten
 cws-impress162-slideshow.diff, i#94193, thorsten
 canvas-directx-lostdevice-fix.diff, n#445628, thorsten
+sw-table-join-fix-i99267.diff, n#417814, flr
+svtools-svrtf-token-ignore-case.diff, n#417818, flr
 
 # fix wrong en-US accelerators in Impress
 fix-sd-accelerators.diff, n#463733, i#97088, jholesov
diff --git a/patches/dev300/svtools-svrtf-token-ignore-case.diff b/patches/dev300/svtools-svrtf-token-ignore-case.diff
new file mode 100644
index 000000000..93ee07af5
--- /dev/null
+++ b/patches/dev300/svtools-svrtf-token-ignore-case.diff
@@ -0,0 +1,20 @@
+diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx
+index 43f7891..0d0c9d4 100644
+--- svtools/source/svrtf/rtfkeywd.cxx
++++ svtools/source/svrtf/rtfkeywd.cxx
+@@ -1183,13 +1183,13 @@ _Optlink
+             nRet = ((RTF_TokenEntry*)pFirst)->pUToken->CompareTo(
+                             *((RTF_TokenEntry*)pSecond)->pUToken );
+         else
+-            nRet = ((RTF_TokenEntry*)pFirst)->pUToken->CompareToAscii(
++            nRet = ((RTF_TokenEntry*)pFirst)->pUToken->CompareIgnoreCaseToAscii(
+                             ((RTF_TokenEntry*)pSecond)->sToken );
+     }
+     else
+     {
+         if( -1 == ((RTF_TokenEntry*)pSecond)->nToken )
+-            nRet = -1 * ((RTF_TokenEntry*)pSecond)->pUToken->CompareToAscii(
++            nRet = -1 * ((RTF_TokenEntry*)pSecond)->pUToken->CompareIgnoreCaseToAscii(
+                             ((RTF_TokenEntry*)pFirst)->sToken );
+         else
+             nRet = strcmp( ((RTF_TokenEntry*)pFirst)->sToken,
diff --git a/patches/dev300/sw-invert-border-spacing.diff b/patches/dev300/sw-invert-border-spacing.diff
index 75775e912..18ed39215 100644
--- a/patches/dev300/sw-invert-border-spacing.diff
+++ b/patches/dev300/sw-invert-border-spacing.diff
@@ -1,5 +1,5 @@
-diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
-index 2478dbf..1923d5a 100644
+diff --git sw/inc/IDocumentSettingAccess.hxx sw/inc/IDocumentSettingAccess.hxx
+index cebdfcd..b7b683f 100644
 --- sw/inc/IDocumentSettingAccess.hxx
 +++ sw/inc/IDocumentSettingAccess.hxx
 @@ -84,6 +84,7 @@ namespace com { namespace sun { namespace star { namespace i18n { struct Forbidd
@@ -10,20 +10,20 @@ index 2478dbf..1923d5a 100644
           // COMPATIBILITY FLAGS END
  
           BROWSE_MODE,
-diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
-index c971473..588b8bd 100644
+diff --git sw/inc/doc.hxx sw/inc/doc.hxx
+index 25de567..5ee662e 100644
 --- sw/inc/doc.hxx
 +++ sw/inc/doc.hxx
 @@ -609,6 +609,7 @@ private:
-     bool mbUnixForceZeroExtLeading                  : 1;   // FME 2006-10-09 #i60945#
      bool mbOldPrinterMetrics                        : 1;   // FME 2007-05-14 #147385#
+     bool mbTabRelativeToIndent                      : 1;   // #i24363# tab stops relative to indent
      bool mbProtectForm                              : 1;
 +    bool mbInvertBorderSpacing                      : 1;
-     bool mbTabRelativeToIndent;                            // #i24363# tab stops relative to indent
      bool mbTabAtLeftIndentForParagraphsInList;             // OD 2008-06-05 #i89181# - see above
  
-diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
-index 1e63ae6..c690edb 100644
+ 	// #i78591#
+diff --git sw/source/core/doc/doc.cxx sw/source/core/doc/doc.cxx
+index 4c7ad45..24f5ef4 100644
 --- sw/source/core/doc/doc.cxx
 +++ sw/source/core/doc/doc.cxx
 @@ -184,6 +184,7 @@ bool SwDoc::get(/*[in]*/ DocumentSettingId id) const
@@ -44,11 +44,11 @@ index 1e63ae6..c690edb 100644
           // COMPATIBILITY FLAGS END
  
          case BROWSE_MODE:
-diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
-index 7821682..4034134 100644
+diff --git sw/source/core/doc/docnew.cxx sw/source/core/doc/docnew.cxx
+index f7bc2c5..19cda11 100644
 --- sw/source/core/doc/docnew.cxx
 +++ sw/source/core/doc/docnew.cxx
-@@ -380,6 +380,7 @@ SwDoc::SwDoc() :
+@@ -379,6 +379,7 @@ SwDoc::SwDoc() :
      // --> OD 2008-06-05 #i89181#
      mbTabAtLeftIndentForParagraphsInList    = false;        // hidden
      // <--
@@ -56,11 +56,11 @@ index 7821682..4034134 100644
  
      //
      // COMPATIBILITY FLAGS END
-diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
-index 0421344..df08b8e 100644
+diff --git sw/source/core/layout/frmtool.cxx sw/source/core/layout/frmtool.cxx
+index 5354200..21fdf63 100644
 --- sw/source/core/layout/frmtool.cxx
 +++ sw/source/core/layout/frmtool.cxx
-@@ -1990,20 +1990,22 @@ void SwBorderAttrs::_CalcBottom()
+@@ -2000,20 +2000,22 @@ void SwBorderAttrs::_CalcBottom()
  
  long SwBorderAttrs::CalcRight( const SwFrm* pCaller ) const
  {
@@ -96,7 +96,7 @@ index 0421344..df08b8e 100644
  
      // --> OD 2008-01-21 #newlistlevelattrs#
      // correction: retrieve left margin for numbering in R2L-layout
-@@ -2018,20 +2020,23 @@ long SwBorderAttrs::CalcRight( const SwFrm* pCaller ) const
+@@ -2028,20 +2030,23 @@ long SwBorderAttrs::CalcRight( const SwFrm* pCaller ) const
  
  long SwBorderAttrs::CalcLeft( const SwFrm *pCaller ) const
  {
@@ -133,11 +133,11 @@ index 0421344..df08b8e 100644
  
      // --> OD 2008-01-21 #newlistlevelattrs#
      // correction: do not retrieve left margin for numbering in R2L-layout
-diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
-index b022499..8d8f310 100644
+diff --git sw/source/core/layout/paintfrm.cxx sw/source/core/layout/paintfrm.cxx
+index a371990..2fed7f7 100644
 --- sw/source/core/layout/paintfrm.cxx
 +++ sw/source/core/layout/paintfrm.cxx
-@@ -4630,7 +4630,7 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
+@@ -4650,7 +4650,7 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
  						 const SwBorderAttrs &rAttrs ) const
  {
      //fuer (Row,Body,Ftn,Root,Column,NoTxt) gibt's hier nix zu tun
@@ -146,11 +146,24 @@ index b022499..8d8f310 100644
          return;
  
  	if ( (GetType() & 0x2000) && 	//Cell
-diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
-index 16bad6c..5a3691f 100644
+diff --git sw/source/filter/rtf/swparrtf.cxx sw/source/filter/rtf/swparrtf.cxx
+index 4ee6616..c70eed1 100644
+--- sw/source/filter/rtf/swparrtf.cxx
++++ sw/source/filter/rtf/swparrtf.cxx
+@@ -309,7 +309,7 @@ void SwRTFParser::Continue( int nToken )
+             // --> FME 2006-02-10 #131283#
+             pDoc->set(IDocumentSettingAccess::TABLE_ROW_KEEP, true);
+             pDoc->set(IDocumentSettingAccess::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION, true);
+-
++	    pDoc->set(IDocumentSettingAccess::INVERT_BORDER_SPACING, true);
+             //
+             // COMPATIBILITY FLAGS END
+             //
+diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx
+index 68be371..65da983 100644
 --- sw/source/filter/ww8/ww8par.cxx
 +++ sw/source/filter/ww8/ww8par.cxx
-@@ -1475,6 +1475,8 @@ void SwWW8ImplReader::ImportDop()
+@@ -1538,6 +1538,8 @@ void SwWW8ImplReader::ImportDop()
      rDoc.set(IDocumentSettingAccess::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION, true);
      // <--
  
@@ -159,11 +172,11 @@ index 16bad6c..5a3691f 100644
      //
      // COMPATIBILITY FLAGS END
      //
-diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
-index c1405d5..288f62d 100644
+diff --git sw/source/filter/ww8/ww8par6.cxx sw/source/filter/ww8/ww8par6.cxx
+index d762dfb..c15042a 100644
 --- sw/source/filter/ww8/ww8par6.cxx
 +++ sw/source/filter/ww8/ww8par6.cxx
-@@ -4707,10 +4707,19 @@ void SwWW8ImplReader::Read_Border(USHORT , const BYTE* , short nLen)
+@@ -4708,10 +4708,19 @@ void SwWW8ImplReader::Read_Border(USHORT , const BYTE* , short nLen)
  
                  maTracer.Log(sw::log::eBorderDistOutside);
  
@@ -187,8 +200,8 @@ index c1405d5..288f62d 100644
  
                  NewAttr( aBox );
  
-diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx
-index d187c0e..80c699e 100644
+diff --git sw/source/ui/uno/SwXDocumentSettings.cxx sw/source/ui/uno/SwXDocumentSettings.cxx
+index 70feea6..2ac36e6 100644
 --- sw/source/ui/uno/SwXDocumentSettings.cxx
 +++ sw/source/ui/uno/SwXDocumentSettings.cxx
 @@ -131,6 +131,7 @@ enum SwDocumentSettingsPropertyHandles
@@ -200,7 +213,7 @@ index d187c0e..80c699e 100644
  
  MasterPropertySetInfo * lcl_createSettingsInfo()
 @@ -184,7 +185,7 @@ MasterPropertySetInfo * lcl_createSettingsInfo()
- 	{ RTL_CONSTASCII_STRINGPARAM("ProtectForm"), HANDLE_PROTECT_FORM, CPPUTYPE_BOOLEAN, 0, 0},
+         { RTL_CONSTASCII_STRINGPARAM("ProtectForm"), HANDLE_PROTECT_FORM, CPPUTYPE_BOOLEAN, 0, 0},
          // --> OD 2008-06-05 #i89181#
          { RTL_CONSTASCII_STRINGPARAM("TabAtLeftIndentForParagraphsInList"), HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, CPPUTYPE_BOOLEAN, 0, 0},
 -
@@ -221,7 +234,7 @@ index d187c0e..80c699e 100644
          default:
  			throw UnknownPropertyException();
  	}
-@@ -1004,7 +1011,12 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf
+@@ -1005,7 +1012,12 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf
          }
          break;
          // <--
diff --git a/patches/dev300/sw-table-join-fix-i99267.diff b/patches/dev300/sw-table-join-fix-i99267.diff
new file mode 100644
index 000000000..8c63228e8
--- /dev/null
+++ b/patches/dev300/sw-table-join-fix-i99267.diff
@@ -0,0 +1,16 @@
+diff --git sw/source/core/layout/tabfrm.cxx sw/source/core/layout/tabfrm.cxx
+index 96a11b5..f2602e4 100644
+--- sw/source/core/layout/tabfrm.cxx
++++ sw/source/core/layout/tabfrm.cxx
+@@ -2102,6 +2102,11 @@ void SwTabFrm::MakeAll()
+ 			{
+ 				bMovedFwd = TRUE;
+ 				bCalcLowers = TRUE;
++                // --> OD 2009-03-06 #i99267#
++                // reset <bSplit> after forward move to assure that follows
++                // can be joined, if further space is available.
++                bSplit = FALSE;
++                // <--
+ 			}
+ 
+         Point aOldPos( (Frm().*fnRect->fnGetPos)() );