From bd43abc94d30332d06fad7964bd01dc5f70c22e7 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Thu, 15 Mar 2012 15:57:54 +0100 Subject: ScNameMgrTable takes a reference, fdo#47307 --- sc/source/ui/inc/namepast.hxx | 1 + sc/source/ui/namedlg/namepast.cxx | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx index b2abb4563bae..77e3712e4eb7 100644 --- a/sc/source/ui/inc/namepast.hxx +++ b/sc/source/ui/inc/namepast.hxx @@ -57,6 +57,7 @@ private: ScRangeManagerTable* mpTable; std::vector maSelectedNames; + boost::ptr_map 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 68a406f69fb2..8b4f78bec88a 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 aCopyMap; - boost::ptr_map aRangeMap; pDoc->GetRangeNameMap(aCopyMap); std::map::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)); -- cgit v1.2.3