ooo-build r14254 - in trunk: . patches/test

[kyoshida svn gnome org]

Author: kyoshida
Date: Thu Oct  9 03:18:16 2008
New Revision: 14254
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14254&view=rev

Log:
2008-10-08  Kohei Yoshida  <kyoshida novell com>

	* patches/test/calc-csv-import-as-text.diff: experimental patch to 
	change the default column type from 'Standard' to 'Text' in the csv 
	import option dialog (n#270668).  Setting the default to 'Text' may be
	the better approach since it doesn't perform type recognition unless
	the user specifically change the column type, which leads to less 
	surprises.


Added:
   trunk/patches/test/calc-csv-import-as-text.diff
Modified:
   trunk/ChangeLog

Added: trunk/patches/test/calc-csv-import-as-text.diff
==============================================================================
--- (empty file)
+++ trunk/patches/test/calc-csv-import-as-text.diff	Thu Oct  9 03:18:16 2008
@@ -0,0 +1,40 @@
+diff --git sc/source/ui/dbgui/csvgrid.cxx sc/source/ui/dbgui/csvgrid.cxx
+index ddbfb44..723f16c 100644
+--- sc/source/ui/dbgui/csvgrid.cxx
++++ sc/source/ui/dbgui/csvgrid.cxx
+@@ -497,7 +497,7 @@ void ScCsvGrid::SetTypeNames( const StringVec& rTypeNames )
+     for( nIx = 0, nItemId = 1; nIx < nCount; ++nIx, ++nItemId )
+         maPopup.InsertItem( nItemId, maTypeNames[ nIx ] );
+ 
+-    ::std::for_each( maColStates.begin(), maColStates.end(), Func_SetType( CSV_TYPE_DEFAULT ) );
++    ::std::for_each( maColStates.begin(), maColStates.end(), Func_SetType( CSV_TYPE_TEXT ) );
+ }
+ 
+ const String& ScCsvGrid::GetColumnTypeName( sal_uInt32 nColIndex ) const
+diff --git sc/source/ui/inc/csvcontrol.hxx sc/source/ui/inc/csvcontrol.hxx
+index 85aa777..dea691b 100644
+--- sc/source/ui/inc/csvcontrol.hxx
++++ sc/source/ui/inc/csvcontrol.hxx
+@@ -65,6 +65,9 @@ const sal_Int32 CSV_MAXCOLCOUNT         = MAXCOLCOUNT;
+ 
+ /** Default column data type. */
+ const sal_Int32 CSV_TYPE_DEFAULT        = 0;
++/** Text column data type. */
++const sal_Int32 CSV_TYPE_TEXT           = 1;
++
+ /** Multi selection with different types. */
+ const sal_Int32 CSV_TYPE_MULTI          = -1;
+ /** No column selected. */
+diff --git sc/source/ui/inc/csvgrid.hxx sc/source/ui/inc/csvgrid.hxx
+index 4729e7b..671e1f6 100644
+--- sc/source/ui/inc/csvgrid.hxx
++++ sc/source/ui/inc/csvgrid.hxx
+@@ -72,7 +72,7 @@ struct ScCsvColState
+     sal_uInt8                   mnFlags;            /// Flags (i.e. selection state).
+ 
+     inline explicit             ScCsvColState(
+-                                        sal_Int32 nType = CSV_TYPE_DEFAULT,
++                                        sal_Int32 nType = CSV_TYPE_TEXT,
+                                         sal_uInt8 nFlags = CSV_COLFLAG_NONE ) :
+                                     mnType( nType ), mnFlags( nFlags ) {}
+