[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Jan Holesovsky]

 patches/dev300/apply                       |    3 +++
 patches/dev300/sw-dde-table-no-header.diff |   11 +++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit 92d1c43b76bae0257655e39360585af8d11b977d
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Sep 16 08:34:52 2010 +0200

    Don't set header in DDE tables, usually not what the user wants.
    
    n#634517
    
    * patches/dev300/apply: Add.
    * patches/dev300/sw-dde-table-no-header.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 13b17bc..7c493b6 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -4030,6 +4030,9 @@ extensions-geometry-in-control-propsheet-fix.diff, bnc#610921, cbosdo
 # is in.  Just don't bother handling such empty "link annotations".
 skip-empty-links-in-pdf.diff, bnc#598816, tml
 
+# don't set header in DDE tables, usually not what the user wants
+sw-dde-table-no-header.diff, n#634517, jholesov
+
 [ Features ]
 # embed generic media files inside odf docs, 2nd part
 # FIXME: this depends on sd-sound.diff
diff --git a/patches/dev300/sw-dde-table-no-header.diff b/patches/dev300/sw-dde-table-no-header.diff
new file mode 100644
index 0000000..1d3c496
--- /dev/null
+++ b/patches/dev300/sw-dde-table-no-header.diff
@@ -0,0 +1,11 @@
+--- sw/source/ui/dochdl/swdtflvr.cxx	2010-09-16 08:28:23.000000000 +0200
++++ sw/source/ui/dochdl/swdtflvr.cxx	2010-09-16 08:28:18.000000000 +0200
+@@ -2222,7 +2222,7 @@ int SwTransferable::_PasteDDE( Transfera
+                 }
+ 
+                 rWrtShell.InsertDDETable(
+-                    SwInsertTableOptions( tabopts::HEADLINE_NO_BORDER, 1 ), // TODO MULTIHEADER
++                    SwInsertTableOptions( tabopts::SPLIT_LAYOUT, 1 ), // TODO MULTIHEADER
+                     pDDETyp, nRows, nCols );
+             }
+             else if( 1 < aExpand.GetTokenCount( '\n' ) )