[libreoffice/f16] Resolves: fdo#38088 rhbz#810267 better CSV import default separators

[Eike Rathke]

commit 5ad15705cdb0e680f9deab15e0d8d71a88f22f08
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Apr 11 15:02:59 2012 +0200

    Resolves: fdo#38088 rhbz#810267 better CSV import default separators

 ...8088-better-CSV-import-default-separators.patch |   54 ++++++++++++++++++++
 libreoffice.spec                                   |    3 +
 2 files changed, 57 insertions(+), 0 deletions(-)
---
diff --git a/0001-fdo-38088-better-CSV-import-default-separators.patch b/0001-fdo-38088-better-CSV-import-default-separators.patch
new file mode 100644
index 0000000..d092094
--- /dev/null
+++ b/0001-fdo-38088-better-CSV-import-default-separators.patch
@@ -0,0 +1,54 @@
+From f31362eb144153c914f1ae0cdda6fe8312c1152d Mon Sep 17 00:00:00 2001
+Message-Id: <f31362eb144153c914f1ae0cdda6fe8312c1152d.1334148872.git.erack at redhat.com>
+From: Eike Rathke <erack at redhat.com>
+Date: Wed, 4 Apr 2012 20:17:22 +0200
+Subject: [PATCH] resolved fdo#38088 rhbz#810267 better CSV import default separators
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="------------erAck-patch-parts"
+
+This is a multi-part message in MIME format.
+--------------erAck-patch-parts
+Content-Type: text/plain; charset=UTF-8; format=fixed
+Content-Transfer-Encoding: 8bit
+
+---
+ .../registry/schema/org/openoffice/Office/Calc.xcs |    2 +-
+ sc/source/ui/dbgui/scuiasciiopt.cxx                |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+
+--------------erAck-patch-parts
+Content-Type: text/x-patch; name="0001-fdo-33088-better-CSV-import-default-separators.patch"
+Content-Transfer-Encoding: 8bit
+Content-Disposition: attachment; filename="0001-fdo-33088-better-CSV-import-default-separators.patch"
+
+diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+index 700d716..0cd2ff3 100644
+--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
++++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+@@ -1098,7 +1098,7 @@
+                         <desc>List of Separators - as a String</desc>
+                         <label>Separators</label>
+                     </info>
+-                    <value>;    </value>
++                    <value>,;&#9;</value>
+                 </prop>
+                 <prop oor:name="TextSeparators" oor:type="xs:string" oor:nillable="false">
+                     <info>
+diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
+index 93d5cfc..2a3a2b94 100644
+--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
++++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
+@@ -268,7 +268,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
+     SetText( aName );
+ 
+     // Default options
+-    OUString sFieldSeparators(RTL_CONSTASCII_USTRINGPARAM("\t"));
++    OUString sFieldSeparators(RTL_CONSTASCII_USTRINGPARAM(",;\t"));
+     OUString sTextSeparators(mcTextSep);
+     bool bMergeDelimiters = false;
+     bool bFixedWidth = false;
+
+--------------erAck-patch-parts--
+
+
diff --git a/libreoffice.spec b/libreoffice.spec
index c06a518..59cbf18 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -246,6 +246,7 @@ Patch124: 0001-Resolves-rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch
 Patch125: libreoffice-kde4fix.patch
 Patch126: 0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch
 Patch127: Introduced-SystemShellExecuteFlags-URIS_ONLY.patch
+Patch128: 0001-fdo-38088-better-CSV-import-default-separators.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1179,6 +1180,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch125 -p0 -b .libreoffice-kde4fix.patch
 %patch126 -p1 -b .fdo-48096-torn-off-popups-trigger-keyboard-.patch
 %patch127 -p1 -b .Introduced-SystemShellExecuteFlags-URIS_ONLY.patch
+%patch128 -p1 -b .fdo-38088-better-CSV-import-default-separators.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings
@@ -2500,6 +2502,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %changelog
 * Tue Apr 03 2012 Stephan Bergmann <sbergman at redhat.com> - 3.4.5.2-12.UNBUILT
 - Fix URIS_ONLY flag issue
+- Resolves: fdo#38088 rhbz#810267 better CSV import default separators
 
 * Mon Apr 02 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-11
 - Resolves: rhbz#708041 focus problems and tearable menus