[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

[Kohei Yoshida]

 sc/source/ui/inc/namepast.hxx     |    1 +
 sc/source/ui/namedlg/namepast.cxx |    5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 70b5ab86907bb0ee75b2e70505cca1d386ae0025
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Mar 15 15:57:54 2012 +0100

    ScNameMgrTable takes a reference, fdo#47307
    
    Signed-off-by: Kohei Yoshida <kohei.yoshida at gmail.com>

diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx
index b2abb45..77e3712 100644
--- a/sc/source/ui/inc/namepast.hxx
+++ b/sc/source/ui/inc/namepast.hxx
@@ -57,6 +57,7 @@ private:
     ScRangeManagerTable* mpTable;
 
     std::vector<rtl::OUString> maSelectedNames;
+    boost::ptr_map<rtl::OUString, ScRangeName> maRangeMap;
 public:
     ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool bInsList=true );
 
diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx
index 68a406f..8b4f78b 100644
--- a/sc/source/ui/namedlg/namepast.cxx
+++ b/sc/source/ui/namedlg/namepast.cxx
@@ -54,18 +54,17 @@ ScNamePasteDlg::ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool )
 {
     ScDocument* pDoc = pShell->GetDocument();
     std::map<rtl::OUString, ScRangeName*> aCopyMap;
-    boost::ptr_map<rtl::OUString, ScRangeName> aRangeMap;
     pDoc->GetRangeNameMap(aCopyMap);
     std::map<rtl::OUString, ScRangeName*>::iterator itr = aCopyMap.begin(), itrEnd = aCopyMap.end();
     for (; itr != itrEnd; ++itr)
     {
         rtl::OUString aTemp(itr->first);
-        aRangeMap.insert(aTemp, new ScRangeName(*itr->second));
+        maRangeMap.insert(aTemp, new ScRangeName(*itr->second));
     }
 
     ScViewData* pViewData = pShell->GetViewData();
     ScAddress aPos(pViewData->GetCurX(), pViewData->GetCurY(), pViewData->GetTabNo());
-    mpTable = new ScRangeManagerTable(&maCtrl, aRangeMap, aPos);
+    mpTable = new ScRangeManagerTable(&maCtrl, maRangeMap, aPos);
 
     maBtnPaste.SetClickHdl( LINK( this, ScNamePasteDlg, ButtonHdl) );
     maBtnPasteAll.SetClickHdl( LINK( this, ScNamePasteDlg, ButtonHdl));