From 99a588660bd7f22a6c16d7b46f3c4fe841445ce0 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mst@openoffice.org>
Date: Tue, 16 Mar 2010 11:28:30 +0100
Subject: 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.

---
 sw/source/ui/wrtsh/wrtsh2.cxx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'sw/source/ui/wrtsh')

diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index a2477349ee44..0472124df128 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -461,20 +461,20 @@ void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk,
     }
     else
     {
-        SwSection aSection( FILE_LINK_SECTION, GetUniqueSectionName( 0 ) );
+        SwSectionData aSection( FILE_LINK_SECTION, GetUniqueSectionName( 0 ) );
         String aLinkFile( rBkmk.GetURL().GetToken(0, '#') );
         aLinkFile += sfx2::cTokenSeperator;
         aLinkFile += sfx2::cTokenSeperator;
         aLinkFile += rBkmk.GetURL().GetToken(1, '#');
         aSection.SetLinkFileName( aLinkFile );
-        aSection.SetProtect( TRUE );
+        aSection.SetProtectFlag( true );
         const SwSection* pIns = InsertSection( aSection );
         if( EXCHG_IN_ACTION_MOVE == nAction && pIns )
         {
-            aSection = *pIns;
+            aSection = SwSectionData(*pIns);
             aSection.SetLinkFileName( aEmptyStr );
             aSection.SetType( CONTENT_SECTION );
-            aSection.SetProtect( FALSE );
+            aSection.SetProtectFlag( false );
 
             // the update of content from linked section at time delete
             // the undostack. Then the change of the section dont create
@@ -482,7 +482,7 @@ void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk,
             BOOL bDoesUndo = DoesUndo();
             if( UNDO_INSSECTION != GetUndoIds() )
                 DoUndo( FALSE );
-            ChgSection( GetSectionFmtPos( *pIns->GetFmt() ), aSection );
+            UpdateSection( GetSectionFmtPos( *pIns->GetFmt() ), aSection );
             DoUndo( bDoesUndo );
         }
     }
-- 
cgit