[Libreoffice-commits] core.git: Branch 'feature/sc-notes-storage' - sc/inc sc/source

[Laurent Godard]

 sc/inc/column.hxx                |    3 ---
 sc/source/core/data/column2.cxx  |   11 ++++-------
 sc/source/core/data/document.cxx |    2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit 3c2b19e733d5f5043a211358134902a441371b04
Author: Laurent Godard <lgodard.libre at laposte.net>
Date:   Thu Oct 3 13:08:06 2013 +0200

    remove GetCellNoteStore method
    
    - directly use maCellNotes
    
    Change-Id: I6e105deb95f8f7737c69db7c942952b1779dfc6f

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 24ba203..00e6058 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -162,9 +162,6 @@ public:
     sc::CellTextAttrStoreType& GetCellAttrStore() { return maCellTextAttrs; }
     const sc::CellTextAttrStoreType& GetCellAttrStore() const { return maCellTextAttrs; }
 
-    sc::CellNoteStoreType& GetCellNoteStore() { return maCellNotes; }
-    const sc::CellNoteStoreType& GetCellNoteStore() const { return maCellNotes; }
-
     ScRefCellValue GetCellValue( SCROW nRow ) const;
     ScRefCellValue GetCellValue( const sc::CellStoreType::const_iterator& itPos, size_t nOffset ) const;
 
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 93887c7..c42ef05 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1688,8 +1688,7 @@ void ScColumn::CopyCellNotesToDocument(SCROW nRow1, SCROW nRow2, ScColumn& rDest
             }
 
             rDestCol.maCellNotes.set(nBlockStart + nOffsetInBlock + nRowOffsetDest, vCloned.begin(), vCloned.end());
-      //      sc::CellNoteStoreType maDestCellNotes = rDestCol.GetCellNoteStore();
-      //      maDestCellNotes.set(nBlockStart + nOffsetInBlock + nRowOffsetDest, vCloned.begin(), vCloned.end());
+      //      rDestCol.maCellNotes.set(nBlockStart + nOffsetInBlock + nRowOffsetDest, vCloned.begin(), vCloned.end());
             break;
         }
         // need to clone notes
@@ -1705,8 +1704,7 @@ void ScColumn::CopyCellNotesToDocument(SCROW nRow1, SCROW nRow2, ScColumn& rDest
             vCloned.push_back(pClonedNote);
         }
         rDestCol.maCellNotes.set(nBlockStart + nOffsetInBlock + nRowOffsetDest, vCloned.begin(), vCloned.end());
-//            sc::CellNoteStoreType maDestCellNotes = rDestCol.GetCellNoteStore();
-//            maDestCellNotes.set(nBlockStart + nOffsetInBlock + nRowOffsetDest, vCloned.begin(), vCloned.end());
+//            rDestCol.maCellNotes.set(nBlockStart + nOffsetInBlock + nRowOffsetDest, vCloned.begin(), vCloned.end());
     }
 
 /*
@@ -1758,9 +1756,8 @@ void ScColumn::DuplicateNotes(SCROW nStartRow, size_t nDataSize, ScColumn& rDest
             }
         }
         // set the cloned notes vector in its dest position
-        sc::CellNoteStoreType maDestCellNotes = rDestCol.GetCellNoteStore();
-        maDestCellNotes.set_empty(nStartRow + nRowOffsetDest, nRowMax - 1 + nRowOffsetDest);
-        maDestBlockPos.miCellNotePos = rDestCol.GetCellNoteStore().set(
+        rDestCol.maCellNotes.set_empty(nStartRow + nRowOffsetDest, nRowMax - 1 + nRowOffsetDest);
+        maDestBlockPos.miCellNotePos = rDestCol.maCellNotes.set(
             maDestBlockPos.miCellNotePos, nStartRow + nRowOffsetDest, vDestNotes.begin(), vDestNotes.end());
 }
 
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 139f679..19ab662 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6095,7 +6095,7 @@ ScPostIt* ScDocument::GetNote(SCCOL nCol, SCROW nRow, SCTAB nTab)
 }
 sc::CellNoteStoreType& ScDocument::GetColNotes(SCCOL nCol, SCTAB nTab)
 {
-        return maTabs[nTab]->aCol[nCol].GetCellNoteStore();
+        return maTabs[nTab]->aCol[nCol].maCellNotes;
 }
 void ScDocument::SetNote(const ScAddress& rPos, ScPostIt* pNote)
 {