From 2faf429643f187cd2cc5c25a6469dfc96034256c Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Thu, 23 Dec 2010 14:16:06 +0100
Subject: [PATCH] Fix bug in SCH_SHEET copy constructor (size not copied, so
 copied hierarchical sheets have a 0 size), and a minor bug in block save.

---
 eeschema/block.cpp     | 2 ++
 eeschema/sch_sheet.cpp | 2 ++
 version.txt            | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/eeschema/block.cpp b/eeschema/block.cpp
index 639f0bd4fd..55390faf32 100644
--- a/eeschema/block.cpp
+++ b/eeschema/block.cpp
@@ -541,6 +541,8 @@ void SaveStructListForPaste( PICKED_ITEMS_LIST& aItemsList )
     item.m_UndoRedoStatus = UR_DELETED;
     for( unsigned ii = 0; ii < aItemsList.GetCount(); ii++ )
     {
+        // Clear m_Flag member of selected items:
+        aItemsList.GetPickedItem( ii )->m_Flags = 0;
         /* Make a copy of the original picked item. */
         SCH_ITEM* DrawStructCopy = DuplicateStruct( (SCH_ITEM*) aItemsList.GetPickedItem( ii ) );
         DrawStructCopy->SetParent( NULL );
diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp
index 279973f6d1..25d2a2609b 100644
--- a/eeschema/sch_sheet.cpp
+++ b/eeschema/sch_sheet.cpp
@@ -45,6 +45,8 @@ SCH_SHEET::SCH_SHEET( const SCH_SHEET& aSheet ) :
     SCH_ITEM( aSheet )
 {
     m_Pos = aSheet.m_Pos;
+    m_Size = aSheet.m_Size;
+    m_Layer = aSheet.m_Layer;
     m_TimeStamp = aSheet.m_TimeStamp;
     m_SheetNameSize = aSheet.m_SheetNameSize;
     m_FileNameSize = aSheet.m_FileNameSize;
diff --git a/version.txt b/version.txt
index 794ef44203..cd6369f9f1 100644
--- a/version.txt
+++ b/version.txt
@@ -1,4 +1,4 @@
 release version:
-2010 dec 22 (BZR testing 2676)
+2010 dec 23 (BZR 2682)
 files (.zip,.tgz):
-kicad-2010-12-22-testing
+kicad-2010-12-23