[Libreoffice-commits] core.git: Branch 'private/kohei/calc-shared-string' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/document.hxx              |    3 +++
 sc/source/core/data/documen2.cxx |    3 +++
 2 files changed, 6 insertions(+)

New commits:
commit e893439bfc51059ba35b2f6d3100ce7df46d1ee0
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Wed Oct 2 21:46:40 2013 -0400

    Add string pool to document.
    
    Change-Id: I7430af7486a2f7a150ed17a0c345aeeb987ec993

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 1e720a8..73d7c1c 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -50,6 +50,7 @@
 
 namespace editeng { class SvxBorderLine; }
 namespace formula { struct VectorRefArray; }
+namespace svl { class StringPool; }
 
 namespace sc {
     struct FormulaGroupContext;
@@ -243,6 +244,8 @@ private:
 
     rtl::Reference<ScPoolHelper> xPoolHelper;
 
+    boost::scoped_ptr<svl::StringPool> mpCellStringPool;
+
     SfxUndoManager*     mpUndoManager;
     ScFieldEditEngine*  pEditEngine;                    // uses pEditPool from xPoolHelper
     ScNoteEditEngine*   pNoteEngine;                    // uses pEditPool from xPoolHelper
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index cd09ffb..54c3577 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -35,6 +35,7 @@
 #include <vcl/virdev.hxx>
 #include <comphelper/processfactory.hxx>
 #include <svl/PasswordHelper.hxx>
+#include "svl/stringpool.hxx"
 #include <tools/tenccvt.hxx>
 #include <tools/urlobj.hxx>
 #include <rtl/crc.h>
@@ -439,6 +440,8 @@ ScDocument::~ScDocument()
 
     delete pPreviewFont;
     OSL_POSTCOND( !pAutoNameCache, "AutoNameCache still set in dtor" );
+
+    mpCellStringPool.reset();
 }
 
 void ScDocument::InitClipPtrs( ScDocument* pSourceDoc )