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

Laurent Godard lgodard.libre at laposte.net
Mon Sep 16 08:30:12 PDT 2013


 sc/inc/postit.hxx              |    8 ++++----
 sc/source/core/data/postit.cxx |   29 +----------------------------
 2 files changed, 5 insertions(+), 32 deletions(-)

New commits:
commit 4f3275fc48a7aa22311b9824ed62276e450df8c2
Author: Laurent Godard <lgodard.libre at laposte.net>
Date:   Mon Sep 16 17:28:07 2013 +0200

    clean unused methods
    
    Change-Id: I249fa9acf2cab8217f859254a34b9073e7280b1d

diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index 26536a1..2b3fe01 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -271,11 +271,11 @@ public:
     size_t size() const;
     bool empty() const;
 
-    ScPostIt* findByAddress(SCCOL nCol, SCROW nRow);
-    const ScPostIt* findByAddress(SCCOL nCol, SCROW nRow) const;
+//    ScPostIt* findByAddress(SCCOL nCol, SCROW nRow);
+//    const ScPostIt* findByAddress(SCCOL nCol, SCROW nRow) const;
+//    ScPostIt* findByAddress(const ScAddress& rAddress);
+//    const ScPostIt* findByAddress(const ScAddress& rAddress) const;
 
-    ScPostIt* findByAddress(const ScAddress& rAddress);
-    const ScPostIt* findByAddress(const ScAddress& rAddress) const;
     /**
      * takes ownership of the
      */
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index f72da35..dc0ce56 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -992,34 +992,6 @@ bool ScNotes::empty() const
     return maNoteMap.empty();
 }
 
-ScPostIt* ScNotes::findByAddress(SCCOL nCol, SCROW nRow)
-{
-    ScNoteMap::iterator itr = maNoteMap.find(std::pair<SCCOL, SCROW>(nCol, nRow));
-    if (itr != maNoteMap.end())
-        return itr->second;
-
-    return NULL;
-}
-
-const ScPostIt* ScNotes::findByAddress(SCCOL nCol, SCROW nRow) const
-{
-    ScNoteMap::const_iterator itr = maNoteMap.find(std::pair<SCCOL, SCROW>(nCol, nRow));
-    if (itr != maNoteMap.end())
-        return itr->second;
-
-    return NULL;
-}
-
-ScPostIt* ScNotes::findByAddress(const ScAddress& rPos)
-{
-    return findByAddress(rPos.Col(), rPos.Row());
-}
-
-const ScPostIt* ScNotes::findByAddress(const ScAddress& rPos) const
-{
-    return findByAddress(rPos.Col(), rPos.Row());
-}
-
 bool ScNotes::insert(SCCOL nCol, SCROW nRow, ScPostIt* pPostIt)
 {
     std::pair<iterator, bool> aResult = maNoteMap.insert(std::pair<ScAddress2D, ScPostIt*>(std::pair<SCCOL, SCROW>(nCol, nRow), pPostIt));
@@ -1121,6 +1093,7 @@ void ScNotes::CopyFromClip(const ScNotes& rNotes, ScDocument* pDoc, SCCOL nCol1,
     }
 }
 
+
 void ScNotes::erase(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bForgetCaption)
 {
     ScNotes::iterator itr = maNoteMap.begin();


More information about the Libreoffice-commits mailing list