diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-03-15 15:57:54 +0100 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-03-16 14:19:19 -0400 |
| commit | 70b5ab86907bb0ee75b2e70505cca1d386ae0025 (patch) | |
| tree | 75bdac3c25e7f44e50860db300d223ce1c39953c | |
| parent | 4ce99d42806e87378614207c8d5adf38d43c756c (diff) | |
ScNameMgrTable takes a reference, fdo#47307
Signed-off-by: Kohei Yoshida <kohei.yoshida@gmail.com>
| -rw-r--r-- | sc/source/ui/inc/namepast.hxx | 1 | ||||
| -rw-r--r-- | 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<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 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<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)); |