ooo-build r14892 - in trunk: . patches/dev300
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r14892 - in trunk: . patches/dev300
- Date: Thu, 18 Dec 2008 23:02:27 +0000 (UTC)
Author: kyoshida
Date: Thu Dec 18 23:02:27 2008
New Revision: 14892
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14892&view=rev
Log:
2008-12-18 Kohei Yoshida <kyoshida novell com>
* patches/dev300/sc-preserve-imp-opts.diff: split into the following
two patches (one patch per module).
* patches/dev300/csv-import-preserve-options-officecfg.diff:
* patches/dev300/csv-import-preserve-options-sc.diff:
* patches/dev300/apply: patch split.
Added:
trunk/patches/dev300/csv-import-preserve-options-officecfg.diff
trunk/patches/dev300/csv-import-preserve-options-sc.diff
- copied, changed from r14891, /trunk/patches/dev300/sc-preserve-imp-opts.diff
Removed:
trunk/patches/dev300/sc-preserve-imp-opts.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Thu Dec 18 23:02:27 2008
@@ -672,7 +672,8 @@
[ CalcFixes ]
# To make CSV Text Import settings persistent, and also allow importing of
# quoted fields as text.
-sc-preserve-imp-opts.diff, i#3687, n#433378, muthusub/kohei
+csv-import-preserve-options-sc.diff, i#3687, n#433378, muthusub/kohei
+csv-import-preserve-options-officecfg.diff, i#3687, n#433378, muthusub/kohei
# Replace usability numb Zoom dialog with a Combo Box
# FIXME: this conflicts with Sun's duplication of this work,
Added: trunk/patches/dev300/csv-import-preserve-options-officecfg.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/csv-import-preserve-options-officecfg.diff Thu Dec 18 23:02:27 2008
@@ -0,0 +1,86 @@
+diff --git officecfg/registry/schema/org/openoffice/Office/Calc.xcs officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+index 3c3fe6b..09e5c52 100644
+--- officecfg/registry/schema/org/openoffice/Office/Calc.xcs
++++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+@@ -1019,6 +1019,81 @@
+ <value>NULL</value>
+ </prop>
+ </group>
++ <group oor:name="Dialogs">
++ <info>
++ <desc>Contains the dialogs settings.</desc>
++ </info>
++ <group oor:name="CSVImport">
++ <info>
++ <desc>Contains setting for Text CSV Import</desc>
++ </info>
++ <prop oor:name="MergeDelimiters" oor:type="xs:boolean">
++ <info>
++ <author>muthusuba</author>
++ <desc>Merge Delimiter check box status</desc>
++ <label>MergeDelimiters</label>
++ </info>
++ <value>false</value>
++ </prop>
++ <prop oor:name="QuotedFieldAsText" oor:type="xs:boolean">
++ <info>
++ <author>kyoshida</author>
++ <desc>If true, quoted field is always imported as text
++ with no exception.</desc>
++ <label>QuotedFieldAsText</label>
++ </info>
++ <value>false</value>
++ </prop>
++ <prop oor:name="Separators" oor:type="xs:string">
++ <info>
++ <author>muthusuba</author>
++ <desc>List of Separators - as a String</desc>
++ <label>Separators</label>
++ </info>
++ <value>; </value>
++ </prop>
++ <prop oor:name="TextSeparators" oor:type="xs:string">
++ <info>
++ <author>muthusuba</author>
++ <desc>Text Separators</desc>
++ <label>TextSeparators</label>
++ </info>
++ <value>"</value>
++ </prop>
++ <prop oor:name="FixedWidth" oor:type="xs:boolean">
++ <info>
++ <author>muthusuba</author>
++ <desc>Fixed width</desc>
++ <label>FixedWidth</label>
++ </info>
++ <value>false</value>
++ </prop>
++ <prop oor:name="FromRow" oor:type="xs:int">
++ <info>
++ <author>muthusuba</author>
++ <desc>From Row</desc>
++ <label>FromRow</label>
++ </info>
++ <value>1</value>
++ </prop>
++ <prop oor:name="CharSet" oor:type="xs:int">
++ <info>
++ <author>muthusuba</author>
++ <desc>Char Set</desc>
++ <label>CharSet</label>
++ </info>
++ <value>-1</value>
++ </prop>
++ <prop oor:name="FixedWidthList" oor:type="xs:string">
++ <info>
++ <author>muthusuba</author>
++ <desc>Fixed Width List of separators</desc>
++ <label>FixedWidthList</label>
++ </info>
++ <value></value>
++ </prop>
++ </group>
++ </group>
+ <group oor:name="Calculate">
+ <info>
+ <desc>Contains settings that affect cell calculation.</desc>
Copied: trunk/patches/dev300/csv-import-preserve-options-sc.diff (from r14891, /trunk/patches/dev300/sc-preserve-imp-opts.diff)
==============================================================================
--- /trunk/patches/dev300/sc-preserve-imp-opts.diff (original)
+++ trunk/patches/dev300/csv-import-preserve-options-sc.diff Thu Dec 18 23:02:27 2008
@@ -1,89 +1,3 @@
-diff --git officecfg/registry/schema/org/openoffice/Office/Calc.xcs officecfg/registry/schema/org/openoffice/Office/Calc.xcs
-index 3c3fe6b..09e5c52 100644
---- officecfg/registry/schema/org/openoffice/Office/Calc.xcs
-+++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs
-@@ -1019,6 +1019,81 @@
- <value>NULL</value>
- </prop>
- </group>
-+ <group oor:name="Dialogs">
-+ <info>
-+ <desc>Contains the dialogs settings.</desc>
-+ </info>
-+ <group oor:name="CSVImport">
-+ <info>
-+ <desc>Contains setting for Text CSV Import</desc>
-+ </info>
-+ <prop oor:name="MergeDelimiters" oor:type="xs:boolean">
-+ <info>
-+ <author>muthusuba</author>
-+ <desc>Merge Delimiter check box status</desc>
-+ <label>MergeDelimiters</label>
-+ </info>
-+ <value>false</value>
-+ </prop>
-+ <prop oor:name="QuotedFieldAsText" oor:type="xs:boolean">
-+ <info>
-+ <author>kyoshida</author>
-+ <desc>If true, quoted field is always imported as text
-+ with no exception.</desc>
-+ <label>QuotedFieldAsText</label>
-+ </info>
-+ <value>false</value>
-+ </prop>
-+ <prop oor:name="Separators" oor:type="xs:string">
-+ <info>
-+ <author>muthusuba</author>
-+ <desc>List of Separators - as a String</desc>
-+ <label>Separators</label>
-+ </info>
-+ <value>; </value>
-+ </prop>
-+ <prop oor:name="TextSeparators" oor:type="xs:string">
-+ <info>
-+ <author>muthusuba</author>
-+ <desc>Text Separators</desc>
-+ <label>TextSeparators</label>
-+ </info>
-+ <value>"</value>
-+ </prop>
-+ <prop oor:name="FixedWidth" oor:type="xs:boolean">
-+ <info>
-+ <author>muthusuba</author>
-+ <desc>Fixed width</desc>
-+ <label>FixedWidth</label>
-+ </info>
-+ <value>false</value>
-+ </prop>
-+ <prop oor:name="FromRow" oor:type="xs:int">
-+ <info>
-+ <author>muthusuba</author>
-+ <desc>From Row</desc>
-+ <label>FromRow</label>
-+ </info>
-+ <value>1</value>
-+ </prop>
-+ <prop oor:name="CharSet" oor:type="xs:int">
-+ <info>
-+ <author>muthusuba</author>
-+ <desc>Char Set</desc>
-+ <label>CharSet</label>
-+ </info>
-+ <value>-1</value>
-+ </prop>
-+ <prop oor:name="FixedWidthList" oor:type="xs:string">
-+ <info>
-+ <author>muthusuba</author>
-+ <desc>Fixed Width List of separators</desc>
-+ <label>FixedWidthList</label>
-+ </info>
-+ <value></value>
-+ </prop>
-+ </group>
-+ </group>
- <group oor:name="Calculate">
- <info>
- <desc>Contains settings that affect cell calculation.</desc>
diff --git sc/source/ui/dbgui/asciiopt.cxx sc/source/ui/dbgui/asciiopt.cxx
index bf6521e..df25128 100644
--- sc/source/ui/dbgui/asciiopt.cxx
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
