[Libreoffice-commits] core.git: include/formula sc/inc sc/source

[Tor Lillqvist]

 include/formula/FormulaCompiler.hxx |    9 ---------
 sc/inc/externalrefmgr.hxx           |   10 ----------
 sc/source/core/inc/parclass.hxx     |    4 ----
 sc/source/ui/inc/docsh.hxx          |    4 ----
 4 files changed, 27 deletions(-)

New commits:
commit 5353c6dc9ddf36c810f32d678c13c1815547897a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Nov 4 10:18:19 2014 +0200

    Bin presumably obsolete SUNWS crack
    
    Change-Id: I83038a7160251e59a2178e54859c2ab8e4bffe2e

diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx
index a4fd1af..101369d 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -70,11 +70,6 @@ public:
     FormulaCompiler(FormulaTokenArray& _rArr);
     virtual ~FormulaCompiler();
 
-    // SUNWS8 needs a forward declared friend, otherwise members of the outer
-    // class are not accessible.
-    class OpCodeMap;
-    friend class FormulaCompiler::OpCodeMap;
-
     /** Mappings from strings to OpCodes and vice versa. */
     class FORMULA_DLLPUBLIC OpCodeMap
     {
@@ -362,10 +357,6 @@ private:
                 rCurr->SetForceArray( true);
         }
 
-    // SUNWS7 needs a forward declared friend, otherwise members of the outer
-    // class are not accessible.
-    class CurrentFactor;
-    friend class FormulaCompiler::CurrentFactor;
     class CurrentFactor
     {
         FormulaTokenRef  pPrevFac;
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 8a2d3a4..d3f2b1e 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -123,11 +123,6 @@ private:
     typedef ::boost::unordered_map<SCROW, RowDataType>     RowsDataType;
 
 public:
-    // SUNWS needs a forward declared friend, otherwise types and members
-    // of the outer class are not accessible.
-    class Table;
-    friend class ScExternalRefCache::Table;
-
     /**
      * Represents a single cached table in an external document.  It only
      * stores non-empty cells; empty cells should never be stored in the data
@@ -336,11 +331,6 @@ private:
     typedef ::boost::unordered_map<ScRange, TokenArrayRef, RangeHash> RangeArrayMap;
     typedef ::boost::unordered_map<OUString, OUString, OUStringHash> NamePairMap;
 
-    // SUNWS needs a forward declared friend, otherwise types and members
-    // of the outer class are not accessible.
-    struct DocItem;
-    friend struct ScExternalRefCache::DocItem;
-
     /** Represents data cached for a single external document. */
     struct DocItem
     {
diff --git a/sc/source/core/inc/parclass.hxx b/sc/source/core/inc/parclass.hxx
index 881dbc2..aa1b074 100644
--- a/sc/source/core/inc/parclass.hxx
+++ b/sc/source/core/inc/parclass.hxx
@@ -101,10 +101,6 @@ private:
         sal_uInt8   nRepeatLast;
     };
 
-    // SUNWS7 needs a forward declared friend, otherwise members of the outer
-    // class are not accessible (in this case CommonData).
-    struct RawData;
-    friend struct ScParameterClassification::RawData;
     struct RawData
     {
         OpCode      eOp;
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 98f7109..fc6bccc 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -121,10 +121,6 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener
     SAL_DLLPRIVATE void          InitOptions(bool bForLoading);
     SAL_DLLPRIVATE void          ResetDrawObjectShell();
 
-    // SUNWS needs a forward declared friend, otherwise types and members
-    // of the outer class are not accessible.
-    class PrepareSaveGuard;
-    friend class ScDocShell::PrepareSaveGuard;
     /** Do things that need to be done before saving to our own format and
         necessary clean ups in dtor. */
     class PrepareSaveGuard