[ooo-build-commit] .: Branch 'ooo-build-3-1-1' - patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                       |    3 +++
 patches/dev300/calc-note-position-fix.diff |   22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+)

New commits:
commit f5c188af535a562357b1e5df53e11a6ff48063cb
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Feb 12 16:27:46 2010 -0500

    Fix incorrect note positioning during row insertion.
    
    Note that this patch is disabled in the default build.
    
    * patches/dev300/apply:
    * patches/dev300/calc-note-position-fix.diff: fixes incorrect recording
      of note's positions during row insertion.  This causes some notes to
      disappear after save and re-load. (n#579454)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 994682c..7a21761 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3494,6 +3494,9 @@ calc-xls-import-sheet-protection-fix.diff, n#542024, kohei
 # Speed up filtering performance with notes.
 calc-perf-filtering-with-notes.diff, n#556927, kohei
 
+# Fix note positioning bug.
+calc-note-position-fix.diff, n#579454, kohei
+
 [ CalcExperimental and CalcRowLimit ]
 # speed up row's hidden state query during pagenation.
 calc-perf-page-and-manual-breaks-fwd-iterator.diff, n#503482, kohei
diff --git a/patches/dev300/calc-note-position-fix.diff b/patches/dev300/calc-note-position-fix.diff
new file mode 100644
index 0000000..71871d4
--- /dev/null
+++ b/patches/dev300/calc-note-position-fix.diff
@@ -0,0 +1,22 @@
+diff --git sc/source/core/data/drwlayer.cxx sc/source/core/data/drwlayer.cxx
+index ea8373e..bda0eda 100644
+--- sc/source/core/data/drwlayer.cxx
++++ sc/source/core/data/drwlayer.cxx
+@@ -547,17 +547,6 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData,
+     if( !pDoc )
+         return;
+ 
+-    if( rData.mbNote )
+-    {
+-        DBG_ASSERT( rOldStart.IsValid(), "ScDrawLayer::RecalcPos - invalid position for cell note" );
+-        /*  When inside an undo action, there may be pending note captions
+-            where cell note is already deleted. The caption will be deleted
+-            later with drawing undo. */
+-        if( ScPostIt* pNote = pDoc->GetNote( rData.maStart ) )
+-            pNote->UpdateCaptionPos( rData.maStart );
+-        return;
+-    }
+-
+     bool bValid1 = rData.maStart.IsValid();
+     SCCOL nCol1 = rData.maStart.Col();
+     SCROW nRow1 = rData.maStart.Row();