[ooo-build-commit] patches/dev300

[Thorsten Behrens]

 patches/dev300/apply                      |    1 
 patches/dev300/cws-kohei03-sc-macfix.diff |   64 ++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)

New commits:
commit 1f05d2bff5669291bbcb9c9ca5fd4a6de5d7773a
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Tue Jan 5 23:51:33 2010 +0100

    Mac-only - fix for class access trouble in calc
    
    * patches/dev300/apply: added the patch
    * patches/dev300/cws-kohei03-sc-macfix.diff: seems Apple's gcc 4.0.1
      at least has a different opinion on nested class access rights;
      had to add more friendship love to various calc places & include
      dociter.hxx at a central spot. would be happy for a cleaner solutuion
      but a bit pressed that close to release
    (cherry picked from commit 3cc2655f30bb550d74696111c701e7890a18f87b)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7116156..5fc8042 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2339,6 +2339,7 @@ SectionOwner => thorsten
 # backport from 3.3, enables apple remote for newer systems
 apple-remote-update.diff, i#107648, thorsten
 sfx2-global-scope-fix.diff, thorsten
+cws-kohei03-sc-macfix.diff, thorsten
 
 [ PardusOnly ]
 pardus-default-ExternalMailer.diff
diff --git a/patches/dev300/cws-kohei03-sc-macfix.diff b/patches/dev300/cws-kohei03-sc-macfix.diff
new file mode 100644
index 0000000..ec4a52f
--- /dev/null
+++ b/patches/dev300/cws-kohei03-sc-macfix.diff
@@ -0,0 +1,64 @@
+diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
+index a664cfd..a734f42 100644
+--- sc/inc/column.hxx
++++ sc/inc/column.hxx
+@@ -36,6 +36,7 @@
+ #include "compressedarray.hxx"
+ #include "address.hxx"
+ #include "rangenam.hxx"
++#include "dociter.hxx"
+ #include <tools/solar.h>
+ 
+ #include <set>
+@@ -118,6 +119,7 @@ friend class ScDocument;					// fuer FillInfo
+ friend class ScDocumentIterator;
+ friend class ScValueIterator;
+ friend class ScDBQueryDataIterator;
++friend class ScDBQueryDataIterator::DataAccessInternal;
+ friend class ScColumnIterator;
+ friend class ScQueryCellIterator;
+ friend class ScMarkedDataIter;
+diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
+index 22cc806..60b57a6 100644
+--- sc/inc/dociter.hxx
++++ sc/inc/dociter.hxx
+@@ -161,6 +161,7 @@ private:
+         const ScDBQueryDataIterator* mpParent;
+     };
+ 
++public:
+     class DataAccessInternal : public DataAccess
+     {
+     public:
+@@ -185,6 +186,7 @@ private:
+         bool                bCalcAsShown;
+     };
+ 
++private:
+     class DataAccessMatrix : public DataAccess
+     {
+     public:
+diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
+index 4d94701..43642e8 100644
+--- sc/inc/document.hxx
++++ sc/inc/document.hxx
+@@ -239,6 +239,7 @@ class ScDocument
+ friend class ScDocumentIterator;
+ friend class ScValueIterator;
+ friend class ScDBQueryDataIterator;
++friend class ScDBQueryDataIterator::DataAccessInternal;
+ friend class ScCellIterator;
+ friend class ScQueryCellIterator;
+ friend class ScHorizontalCellIterator;
+diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
+index 9606b98..73bdb6a 100644
+--- sc/inc/table.hxx
++++ sc/inc/table.hxx
+@@ -188,6 +188,7 @@ friend class ScDocument;					// fuer FillInfo
+ friend class ScDocumentIterator;
+ friend class ScValueIterator;
+ friend class ScDBQueryDataIterator;
++friend class ScDBQueryDataIterator::DataAccessInternal;
+ friend class ScCellIterator;
+ friend class ScQueryCellIterator;
+ friend class ScHorizontalCellIterator;