[Libreoffice-commits] .: 4 commits - basctl/source sc/source

[Noel Power]

 basctl/source/basicide/baside2b.cxx |    1 -
 sc/source/filter/excel/xetable.cxx  |    7 ++-----
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 00f1a3ed8ec17b8274a7bf3ee8f5d394a8a16bab
Author: Noel Power <noel.power at novell.com>
Date:   Thu Aug 2 19:24:00 2012 +0100

    new fix for fdo#52998
    
    Change-Id: Icc5e90ac40056430bfbe36d8da1aaad8716cfee9

diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
index bf189bf..e83c119 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -510,7 +510,7 @@ void ExcTable::FillAsTable( SCTAB nCodeNameIdx )
     }
 
     // list of NOTE records, generated by the cell table
-    aRecList.AppendRecord( mxCellTable->CreateRecord( EXC_ID_NOTE ) );
+    aRecList.AppendRecord( mxNoteList );
 
     // sheet view settings: WINDOW2, SCL, PANE, SELECTION
     aRecList.AppendNewRecord( new XclExpTabViewSettings( GetRoot(), mnScTab ) );
@@ -589,10 +589,8 @@ void ExcTable::FillAsXmlTable( SCTAB nCodeNameIdx )
     aRecList.AppendRecord( GetPivotTableManager().CreatePivotTablesRecord( mnScTab ) );
 
     // list of NOTE records, generated by the cell table
-    XclExpRecordRef xNotes = mxCellTable->CreateRecord( EXC_ID_NOTE );
-    XclExpRecordList< XclExpNote >* xNoteList = dynamic_cast< XclExpRecordList< XclExpNote >* >( xNotes.get() );
-    if( xNoteList != NULL && !xNoteList->IsEmpty() )
-        aRecList.AppendNewRecord( new XclExpComments( mnScTab, *xNoteList ) );
+    if( mxNoteList != NULL && !mxNoteList->IsEmpty() )
+        aRecList.AppendNewRecord( new XclExpComments( mnScTab, *mxNoteList ) );
 
     // web queries
     Add( new XclExpWebQueryBuffer( GetRoot() ) );
commit f9a453fb01908e16032abdbf1f895666e1d260a6
Author: Noel Power <noel.power at novell.com>
Date:   Fri Aug 3 08:57:16 2012 +0100

    Revert "fix fdo#52998 xls(x) comment export problems"
    
    This reverts commit 6068f2f7cf5d66c68241b3831851b413b2e0b3ba.

diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 20bff22..d611077 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -41,7 +41,6 @@
 #include "xehelper.hxx"
 #include "xecontent.hxx"
 #include "xeescher.hxx"
-#include "postit.hxx"
 
 using namespace ::oox;
 
@@ -2356,10 +2355,8 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) :
         if( xCell )
             maRowBfr.AppendCell( xCell, bIsMergedBase );
 
-        ScNotes* pNotes = rDoc.GetNotes( nScTab );
-        const ScPostIt* pScNote = pNotes ? pNotes->findByAddress( aScPos ) : NULL;
-        if ( aAddNoteText.Len() || pScNote )
-            mxNoteList->AppendNewRecord( new XclExpNote( GetRoot(), aScPos, pScNote, aAddNoteText ) );
+        if ( aAddNoteText.Len()  )
+            mxNoteList->AppendNewRecord( new XclExpNote( GetRoot(), aScPos, NULL, aAddNoteText ) );
 
         // other sheet contents
         if( pPattern )
commit a8bf0571b1bb8c46502392a7ffc57d07f967d2b1
Author: Noel Power <noel.power at novell.com>
Date:   Fri Aug 3 08:56:07 2012 +0100

    readd fix for fdo#47907 i.e "Revert "Revert "fix for fdo#47907""
    
    This reverts commit f29c91f3351db2887f994c2cc82ceaaa6d717906.
    
    Change-Id: I347a4e115cd1d85fa36242f89d2e8131de9cf57e

diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index a5702c1..c3223c6 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -682,7 +682,6 @@ void EditorWindow::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
                 ( 0, pModulWindow->GetBreakPointWindow().GetCurYOffset() - pEditView->GetStartDocPos().Y() );
             pModulWindow->GetLineNumberWindow().DoScroll
                 ( 0, pModulWindow->GetLineNumberWindow().GetCurYOffset() - pEditView->GetStartDocPos().Y() );
-            pModulWindow->Invalidate();
         }
         else if( rTextHint.GetId() == TEXT_HINT_TEXTHEIGHTCHANGED )
         {
commit c4ef97e6bea0e7de3fa7f0842b3319478d869ae0
Author: Noel Power <noel.power at novell.com>
Date:   Fri Aug 3 08:54:11 2012 +0100

    Revert "new fix for fdo#47907"
    
    This reverts commit 285a5ae06cf51927c2df4b47043e51394aab98b7.

diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
index e83c119..bf189bf 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -510,7 +510,7 @@ void ExcTable::FillAsTable( SCTAB nCodeNameIdx )
     }
 
     // list of NOTE records, generated by the cell table
-    aRecList.AppendRecord( mxNoteList );
+    aRecList.AppendRecord( mxCellTable->CreateRecord( EXC_ID_NOTE ) );
 
     // sheet view settings: WINDOW2, SCL, PANE, SELECTION
     aRecList.AppendNewRecord( new XclExpTabViewSettings( GetRoot(), mnScTab ) );
@@ -589,8 +589,10 @@ void ExcTable::FillAsXmlTable( SCTAB nCodeNameIdx )
     aRecList.AppendRecord( GetPivotTableManager().CreatePivotTablesRecord( mnScTab ) );
 
     // list of NOTE records, generated by the cell table
-    if( mxNoteList != NULL && !mxNoteList->IsEmpty() )
-        aRecList.AppendNewRecord( new XclExpComments( mnScTab, *mxNoteList ) );
+    XclExpRecordRef xNotes = mxCellTable->CreateRecord( EXC_ID_NOTE );
+    XclExpRecordList< XclExpNote >* xNoteList = dynamic_cast< XclExpRecordList< XclExpNote >* >( xNotes.get() );
+    if( xNoteList != NULL && !xNoteList->IsEmpty() )
+        aRecList.AppendNewRecord( new XclExpComments( mnScTab, *xNoteList ) );
 
     // web queries
     Add( new XclExpWebQueryBuffer( GetRoot() ) );