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

[Tor Lillqvist]

 patches/dev300/calc-perf-import-dbf-sc.diff |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 32dcc5f972818dec42e57ecce47f9a4d5237f48e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri May 21 12:43:59 2010 +0300

    Fix some incorrect diff hunk context lines

diff --git a/patches/dev300/calc-perf-import-dbf-sc.diff b/patches/dev300/calc-perf-import-dbf-sc.diff
index 8e9e76a..bc44935 100644
--- a/patches/dev300/calc-perf-import-dbf-sc.diff
+++ b/patches/dev300/calc-perf-import-dbf-sc.diff
@@ -97,9 +97,7 @@ diff --git sc/inc/dociter.hxx sc/inc/dociter.hxx
 index 749e674..ce1ee02 100644
 --- sc/inc/dociter.hxx
 +++ sc/inc/dociter.hxx
-@@ -35,8 +35,10 @@
- #include "queryparam.hxx"
- 
+@@ -35,6 +35,8 @@
  #include <memory>
  
  #include <set>
@@ -217,8 +215,7 @@ diff --git sc/inc/document.hxx sc/inc/document.hxx
 index 72b790c..5d33fb3 100644
 --- sc/inc/document.hxx
 +++ sc/inc/document.hxx
-@@ -146,7 +146,9 @@ class ScFormulaParserPool;
- struct ScClipParam;        
+@@ -146,6 +146,8 @@ class ScFormulaParserPool;
  struct ScClipRangeNameData;
  class ScRowBreakIterator;
  struct ScSetStringParam;
@@ -248,8 +245,7 @@ diff --git sc/inc/table.hxx sc/inc/table.hxx
 index a901eab..ebe4ce1 100644
 --- sc/inc/table.hxx
 +++ sc/inc/table.hxx
-@@ -85,7 +85,8 @@ struct ScSetStringParam;
- class ScFlatUInt16RowSegments;
+@@ -85,6 +85,7 @@ struct ScSetStringParam;
  class ScFlatBoolRowSegments;
  class ScFlatBoolColSegments;
  struct ScSetStringParam;
@@ -448,7 +444,7 @@ index c03eb91..5bca66e 100644
  
  #include <vector>
  
-@@ -2147,3 +2151,96 @@ const ScPatternAttr* ScAttrRectIterator::GetNext( SCCOL& rCol1, SCCOL& rCol2,
+@@ -2147,6 +2151,100 @@ const ScPatternAttr* ScAttrRectIterator::GetNext( SCCOL& rCol1, SCCOL& rCol2,
      return NULL;		// is nix mehr
  }
  
@@ -545,6 +541,10 @@ index c03eb91..5bca66e 100644
 +        nProgressStart += mrDoc.pTab[nTab]->GetWeightedCount();
 +    }
 +}
++
+ //-------------------------------------------------------------------------------
+ 
+ ScAttrRectIterator::ScAttrRectIterator(ScDocument* pDocument, SCTAB nTable,
 diff --git sc/source/core/data/docparam.cxx sc/source/core/data/docparam.cxx
 new file mode 100644
 index 0000000..bb2e073