From de5d54707c878cb645c6d25a621e370a953aefa0 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Wed, 11 Apr 2012 15:10:49 +0200 Subject: [PATCH] Resolves: fdo#38088 rhbz#810267 better CSV import default separators --- ...better-CSV-import-default-separators.patch | 54 +++++++++++++++++++ libreoffice.spec | 7 ++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 0001-fdo-38088-better-CSV-import-default-separators.patch 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: +From: Eike Rathke +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 @@ + List of Separators - as a String + + +- ; ++ ,; + + + +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 5a9ab91..b084b1e 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -35,7 +35,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 5%{?dist} +Release: 6%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -144,6 +144,7 @@ Patch28: 0001-desktop-do-not-complain-about-soffice-command-line-o.patch Patch29: 0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch Patch30: 0001-Introduced-SystemShellExecuteFlags-URIS_ONLY.patch Patch31: 0001-Simplify-code-and-use-proper-register-names-for-linu.patch +Patch32: 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} @@ -999,6 +1000,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch29 -p1 -b .fdo48096-torn-off-popups-trigger-keyboard-.patch %patch30 -p1 -b .Introduced-SystemShellExecuteFlags-URIS_ONLY.patch %patch31 -p1 -b .Simplify-code-and-use-proper-register-names-for-linu.patch +%patch32 -p1 -b .fdo-38088-better-CSV-import-default-separators.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2286,6 +2288,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Wed Apr 11 2012 Eike Rathke - 3.5.2.1-6 +- Resolves: fdo#38088 rhbz#810267 better CSV import default separators + * Tue Apr 10 2012 Caolán McNamara - 3.5.2.1-5 - Resolves: rhbz#811226 FTBFS ARM