odfmetadata4: #i109599#: remove SwSection::operator=():

move most SwSection members to new class SwSectionData.
replace evil SwSection::operator=() with SwSection::SetSectionData().
various method signatures changed to take SwSectionData parameter.
rename SwDoc::ChgSection() to UpdateSection().
SwUnodo{Ins,Chg,Del}Section: adapt to store SwSectionData/SwTOXBase.
regionsw.hxx: SectRepr: change SwSection member to SwSectionData.

1 files changed, 127 insertions, 74 deletions

diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 6ca584c82a11..6249251a7514 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -28,14 +28,15 @@
 #ifndef _SECTION_HXX
 #define _SECTION_HXX
 
+#include <boost/utility.hpp>
 
 #include <com/sun/star/uno/Sequence.h>
+
 #include <sfx2/lnkbase.hxx>
 #include <tools/rtti.hxx>
-#ifndef _TOOLS_REF_HXX
 #include <tools/ref.hxx>
-#endif
 #include <svl/svarray.hxx>
+
 #include <frmfmt.hxx>
 
 
@@ -77,61 +78,119 @@ enum LinkCreateType
     CREATE_UPDATE           // Link connecten und updaten
 };
 
+class SW_DLLPUBLIC SwSectionData
+{
+private:
+    SectionType m_eType;
+
+    String m_sSectionName;
+    String m_sCondition;
+    String m_sLinkFileName;
+    String m_sLinkFilePassword; // JP 27.02.2001: must be changed to Sequence
+    ::com::sun::star::uno::Sequence <sal_Int8> m_Password;
+
+    /// it seems this flag caches the current final "hidden" state
+    bool m_bHiddenFlag          : 1;
+    /// flags that correspond to attributes in the format:
+    /// may have different value than format attribute:
+    /// format attr has value for this section, while flag is
+    /// effectively ORed with parent sections!
+    bool m_bProtectFlag         : 1;
+    // --> FME 2004-06-22 #114856# edit in readonly sections
+    bool m_bEditInReadonlyFlag  : 1;
+    // <--
+    bool m_bHidden              : 1; // all paragraphs hidden?
+    bool m_bCondHiddenFlag      : 1; // Hiddenflag for condition
+    bool m_bConnectFlag         : 1; // connected to server?
+
+public:
+
+    SwSectionData(SectionType const eType, String const& rName);
+    explicit SwSectionData(SwSection const&);
+    SwSectionData(SwSectionData const&);
+    SwSectionData & operator=(SwSectionData const&);
+    bool operator==(SwSectionData const&) const;
+
+    String const& GetSectionName() const    { return m_sSectionName; }
+    void SetSectionName(String const& rName){ m_sSectionName = rName; }
+    SectionType GetType() const             { return m_eType; }
+    void SetType(SectionType const eNew)    { m_eType = eNew; }
+
+    bool IsHidden() const { return m_bHidden; }
+    void SetHidden(bool const bFlag = true) { m_bHidden = bFlag; }
+
+    bool IsHiddenFlag() const { return m_bHiddenFlag; }
+    SW_DLLPRIVATE void
+        SetHiddenFlag(bool const bFlag) { m_bHiddenFlag = bFlag; }
+    bool IsProtectFlag() const { return m_bProtectFlag; }
+    SW_DLLPRIVATE void
+        SetProtectFlag(bool const bFlag) { m_bProtectFlag = bFlag; }
+    // --> FME 2004-06-22 #114856# edit in readonly sections
+    bool IsEditInReadonlyFlag() const { return m_bEditInReadonlyFlag; }
+    void SetEditInReadonlyFlag(bool const bFlag)
+        { m_bEditInReadonlyFlag = bFlag; }
+    // <--
+
+    void SetCondHidden(bool const bFlag = true) { m_bCondHiddenFlag = bFlag; };
+    bool IsCondHidden() const { return m_bCondHiddenFlag; }
+
+    String const& GetCondition() const      { return m_sCondition; }
+    void SetCondition(String const& rNew)   { m_sCondition = rNew; }
+
+    String const& GetLinkFileName() const   { return m_sLinkFileName; };
+    void SetLinkFileName(String const& rNew, String const* pPassWd = 0)
+    {
+        m_sLinkFileName = rNew;
+        if (pPassWd) { SetLinkFilePassword(*pPassWd); }
+    }
+
+    String const& GetLinkFilePassword() const   { return m_sLinkFilePassword; }
+    void SetLinkFilePassword(String const& rS)  { m_sLinkFilePassword = rS; }
+
+    ::com::sun::star::uno::Sequence<sal_Int8> const& GetPassword() const
+                                            { return m_Password; }
+    void SetPassword(::com::sun::star::uno::Sequence<sal_Int8> const& rNew)
+                                            { m_Password = rNew; }
+    bool IsLinkType() const
+    { return (DDE_LINK_SECTION == m_eType) || (FILE_LINK_SECTION == m_eType); }
 
-class SW_DLLPUBLIC SwSection : public SwClient
+    bool IsConnectFlag() const                  { return m_bConnectFlag; }
+    void SetConnectFlag(bool const bFlag = true){ m_bConnectFlag = bFlag; }
+};
+
+class SW_DLLPUBLIC SwSection
+    : public SwClient
+    , private ::boost::noncopyable
 {
     // damit beim Anlegen/Loeschen von Frames das Flag richtig gepflegt wird!
     friend class SwSectionNode;
     // the "read CTOR" of SwSectionFrm have to change the Hiddenflag
     friend class SwSectionFrm;
 
-    String sSectionNm;
-    String sCondition;          // erstmal, vielleicht auch mal ein Feld ??
-    String sLinkFileName,
-           sLinkFilePassWd;     // JP 27.02.2001: must later changed to Sequence
-    ::com::sun::star::uno::Sequence <sal_Int8> aPasswd;
+private:
+    SwSectionData m_Data;
 
     SwServerObjectRef refObj;   // falls DataServer -> Pointer gesetzt
     ::sfx2::SvBaseLinkRef refLink;
 
-    SectionType eType;
-
-    BOOL bProtectFlag : 1;      // Flags fuer schnelle Abfragen, wird ueber
-                                // Attribut im Format gesetzt
-    BOOL bHiddenFlag : 1;       // Flag: Absaetze versteckt ?
-    // --> FME 2004-06-22 #114856# edit in readonly sections
-    BOOL bEditInReadonlyFlag : 1;
-    // <--
-    BOOL bHidden : 1;           // alle Absaetze nicht sichtbar ?
-    BOOL bCondHiddenFlag : 1;   // Hiddenflag fuer die Bedingung ?
-    BOOL bConnectFlag : 1;      // Flag: "Verbindung zum Server" vorhanden?
-
-
-    SW_DLLPRIVATE void _SetHiddenFlag( BOOL bHidden, BOOL bCondition );
-    SW_DLLPRIVATE void _SetProtectFlag( BOOL bFlag ) { bProtectFlag = bFlag; }
-    /* SW_DLLPUBLIC */ BOOL _IsProtect() const;
-
-    // --> FME 2004-06-22 #114856# edit in readonly sections
-    void _SetEditInReadonlyFlag( BOOL bFlag ) { bEditInReadonlyFlag = bFlag; }
-    BOOL _IsEditInReadonly() const;
-    // <--
+    SW_DLLPRIVATE void ImplSetHiddenFlag(
+            bool const bHidden, bool const bCondition);
 
 public:
     TYPEINFO();     // rtti
 
-    SwSection( SectionType eType, const String& rName,
-                SwSectionFmt* pFmt = 0 );
-    ~SwSection();
+    SwSection(SectionType const eType, String const& rName,
+                SwSectionFmt & rFormat);
+    virtual ~SwSection();
+
+    bool DataEquals(SwSectionData const& rCmp) const;
 
-    // kopiere nur die Daten der Section!
-    // Ableitung bleibt (beim Left) erhalten.
-    SwSection& operator=( const SwSection& );
-    BOOL operator==( const SwSection& rCmp ) const;
+    void SetSectionData(SwSectionData const& rData);
 
-    const String& GetName() const           { return sSectionNm; }
-    void SetName( const String& rName )     { sSectionNm = rName; }
-    SectionType GetType() const             { return eType; }
-    void SetType( SectionType eNew )        { eType = eNew; }
+    String const& GetName() const           { return m_Data.GetSectionName(); }
+    void SetName(String const& rName)       { m_Data.SetSectionName(rName); }
+    SectionType GetType() const             { return m_Data.GetType(); }
+    void SetType(SectionType const eType)   { return m_Data.SetType(eType); }
 
     SwSectionFmt* GetFmt()          { return (SwSectionFmt*)pRegisteredIn; }
     SwSectionFmt* GetFmt() const    { return (SwSectionFmt*)pRegisteredIn; }
@@ -140,50 +199,47 @@ public:
 
     // setze die Hidden/Protected -> gesamten Baum updaten !
     // (Attribute/Flags werden gesetzt/erfragt)
-    BOOL IsHidden() const { return bHidden; }
-    BOOL IsProtect() const { return GetFmt() ? _IsProtect()
-                                            : IsProtectFlag(); }
-
+    bool IsHidden()  const { return m_Data.IsHidden(); }
+    void SetHidden (bool const bFlag = true);
+    bool IsProtect() const;
+    void SetProtect(bool const bFlag = true);
     // --> FME 2004-06-22 #114856# edit in readonly sections
-    BOOL IsEditInReadonly()const { return GetFmt() ? _IsEditInReadonly() : IsEditInReadonlyFlag(); }
-    void SetEditInReadonly( BOOL bFlag = TRUE );
+    bool IsEditInReadonly() const;
+    void SetEditInReadonly(bool const bFlag = true);
     // <--
 
-    void SetHidden( BOOL bFlag = TRUE );
-    void SetProtect( BOOL bFlag = TRUE );
-
     // erfrage die internen Flags (Zustand inklusive Parents nicht, was
     // aktuell an der Section gesetzt ist!!)
-    BOOL IsHiddenFlag() const { return bHiddenFlag; }
-    BOOL IsProtectFlag() const { return bProtectFlag; }
+    bool IsHiddenFlag()  const { return m_Data.IsHiddenFlag(); }
+    bool IsProtectFlag() const { return m_Data.IsProtectFlag(); }
     // --> FME 2004-06-22 #114856# edit in readonly sections
-    BOOL IsEditInReadonlyFlag() const { return bEditInReadonlyFlag; }
+    bool IsEditInReadonlyFlag() const { return m_Data.IsEditInReadonlyFlag(); }
     // <--
 
-    void SetCondHidden( BOOL bFlag = TRUE );
-    BOOL IsCondHidden() const { return bCondHiddenFlag; }
+    void SetCondHidden(bool const bFlag = true);
+    bool IsCondHidden() const { return m_Data.IsCondHidden(); }
     // erfrage (auch ueber die Parents), ob diese Section versteckt sein soll.
     BOOL CalcHiddenFlag() const;
 
 
     inline SwSection* GetParent() const;
 
-    // setze/erfrage die Bedingung
-    const String& GetCondition() const          { return sCondition; }
-    void SetCondition( const String& rNew )     { sCondition = rNew; }
+    String const& GetCondition() const      { return m_Data.GetCondition(); }
+    void SetCondition(String const& rNew)   { m_Data.SetCondition(rNew); }
 
-    // setze/erfrage den gelinkten FileNamen
     const String& GetLinkFileName() const;
-    void SetLinkFileName( const String& rNew, const String* pPassWd = 0 );
-    // Passwort des gelinkten Files (nur waehrend der Laufzeit gueltig!)
-    const String& GetLinkFilePassWd() const         { return sLinkFilePassWd; }
-    void SetLinkFilePassWd( const String& rS )      { sLinkFilePassWd = rS; }
+    void SetLinkFileName(String const& rNew, String const*const pPassWd = 0);
+    // password of linked file (only valid during runtime!)
+    String const& GetLinkFilePassword() const
+        { return m_Data.GetLinkFilePassword(); }
+    void SetLinkFilePassword(String const& rS)
+        { m_Data.SetLinkFilePassword(rS); }
 
     // get / set password of this section
-    const ::com::sun::star::uno::Sequence <sal_Int8>&
-            GetPasswd() const               { return aPasswd; }
-    void SetPasswd( const ::com::sun::star::uno::Sequence <sal_Int8>& rNew )
-                                            { aPasswd = rNew; }
+    ::com::sun::star::uno::Sequence<sal_Int8> const& GetPassword() const
+                                            { return m_Data.GetPassword(); }
+    void SetPassword(::com::sun::star::uno::Sequence <sal_Int8> const& rNew)
+                                            { m_Data.SetPassword(rNew); }
 
     // Daten Server-Methoden
     void SetRefObject( SwServerObject* pObj );
@@ -206,12 +262,12 @@ public:
 
     void MakeChildLinksVisible( const SwSectionNode& rSectNd );
 
-    BOOL IsLinkType() const
-        { return DDE_LINK_SECTION == eType || FILE_LINK_SECTION == eType; }
+    bool IsLinkType() const { return m_Data.IsLinkType(); }
 
     // Flags fuer UI - Verbindung geklappt?
-    BOOL IsConnectFlag() const                  { return bConnectFlag; }
-    void SetConnectFlag( BOOL bFlag = TRUE )    { bConnectFlag = bFlag; }
+    bool IsConnectFlag() const      { return m_Data.IsConnectFlag(); }
+    void SetConnectFlag(bool const bFlag = true)
+                                    { m_Data.SetConnectFlag(bFlag); }
 
     // return the TOX base class if the section is a TOX section
     const SwTOXBase* GetTOXBase() const;
@@ -219,10 +275,7 @@ public:
     // --> OD 2007-02-14 #b6521322#
     void BreakLink();
     // <--
-private:
-    // privater Constructor, weil nie kopiert werden darf !!
-    SwSection( const SwSection& );
-    // @@@ but copy assignment "SwSection & operator= ( const SwSection& )" is public? @@@
+
 };