[ooo-build-commit] .: patches/dev300

[Tor Lillqvist]

 patches/dev300/calc-html-csv-import-force-text-cell.diff |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 4f70a78a43c6dd0ab2972ebe2a3d6bfcd3060830
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri May 21 12:11:45 2010 +0300

    Fix some inconsistent patch context lines

diff --git a/patches/dev300/calc-html-csv-import-force-text-cell.diff b/patches/dev300/calc-html-csv-import-force-text-cell.diff
index 410c5e2..3301947 100644
--- a/patches/dev300/calc-html-csv-import-force-text-cell.diff
+++ b/patches/dev300/calc-html-csv-import-force-text-cell.diff
@@ -21,13 +21,13 @@ index 270acc3..2f11838 100644
 --- sc/inc/column.hxx
 +++ sc/inc/column.hxx
 @@ -66,6 +66,7 @@ class ScPostIt;
- struct ScFunctionData;
  struct ScLineFlags;
  struct ScMergePatternState;
  class ScFlatBoolRowSegments;
 +struct ScSetStringParam;
  
  #define COLUMN_DELTA	4
+ 
 @@ -237,8 +238,7 @@ public:
                  //	TRUE = Zahlformat gesetzt
      BOOL		SetString( SCROW nRow, SCTAB nTab, const String& rString,
@@ -42,8 +42,7 @@ diff --git sc/inc/document.hxx sc/inc/document.hxx
 index ffba48d..fff03fe 100644
 --- sc/inc/document.hxx
 +++ sc/inc/document.hxx
-@@ -144,7 +144,8 @@ class SfxUndoManager;
- class ScFormulaParserPool;
+@@ -144,6 +144,7 @@ class SfxUndoManager;
  struct ScClipParam;        
  struct ScClipRangeNameData;
  class ScRowBreakIterator;
@@ -111,10 +110,7 @@ diff --git sc/inc/table.hxx sc/inc/table.hxx
 index 0b1228b..a6609b9 100644
 --- sc/inc/table.hxx
 +++ sc/inc/table.hxx
-@@ -73,10 +73,10 @@ struct RowInfo;
- struct ScFunctionData;
- struct ScLineFlags;
- class CollatorWrapper;
+@@ -73,7 +73,7 @@ struct RowInfo;
  class ScFlatUInt16RowSegments;
  class ScFlatBoolRowSegments;
  class ScFlatBoolColSegments;