diff options
| author | Rafael Dominguez <venccsralph@gmail.com> | 2013-04-07 21:46:11 -0430 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-04-10 08:31:06 +0000 |
| commit | 372f50605347d750ecb3e50c05ec4c27636b48d9 (patch) | |
| tree | dd42ccf42ae0f261eeb913f3f9e9ae0b7ae7127a /sfx2 | |
| parent | c5a8e0f1dc87ebba5a4ae79fdcdfbdd4aaebce87 (diff) | |
Display correct region name in error messages.
Change-Id: Icf4149272f67df6681bdad711362dd7d3802d04a
Reviewed-on: https://gerrit.libreoffice.org/3300
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/sfx2/templatelocalview.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/control/templatelocalview.cxx | 11 | ||||
| -rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 6 |
3 files changed, 16 insertions, 3 deletions
diff --git a/sfx2/inc/sfx2/templatelocalview.hxx b/sfx2/inc/sfx2/templatelocalview.hxx index 2e7e400ac1d2..09b69ce762ce 100644 --- a/sfx2/inc/sfx2/templatelocalview.hxx +++ b/sfx2/inc/sfx2/templatelocalview.hxx @@ -50,6 +50,8 @@ public: OUString getRegionName(const sal_uInt16 nRegionId) const; + OUString getRegionItemName(const sal_uInt16 nItemId) const; + std::vector<OUString> getFolderNames (); std::vector<TemplateItemProperties> diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index a4437c3d7a43..884897cf7bb1 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -194,6 +194,17 @@ OUString TemplateLocalView::getRegionName(const sal_uInt16 nRegionId) const return mpDocTemplates->GetRegionName(nRegionId); } +OUString TemplateLocalView::getRegionItemName(const sal_uInt16 nItemId) const +{ + for (size_t i = 0; i < maRegions.size(); ++i) + { + if (maRegions[i]->mnId == nItemId) + return maRegions[i]->maTitle; + } + + return OUString(); +} + std::vector<OUString> TemplateLocalView::getFolderNames() { size_t n = maRegions.size(); diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 948de702f9a4..6f78ebe7e120 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -1467,7 +1467,7 @@ void SfxTemplateManagerDlg::localMoveTo(sal_uInt16 nMenuId) aTemplateList = aTemplateList + "\n" + (*pIter)->maTitle; } - OUString aDst = maView->GetItemText(nItemId); + OUString aDst = maView->getRegionItemName(nItemId); OUString aMsg(SfxResId(STR_MSG_ERROR_LOCAL_MOVE).toString()); aMsg = aMsg.replaceFirst("$1",aDst); ErrorBox(this, WB_OK,aMsg.replaceFirst( "$2",aTemplateList)).Execute(); @@ -1523,7 +1523,7 @@ void SfxTemplateManagerDlg::remoteMoveTo(const sal_uInt16 nMenuId) { OUString aMsg(SfxResId(STR_MSG_ERROR_REMOTE_MOVE).toString()); aMsg = aMsg.replaceFirst("$1",mpOnlineView->getCurRegionName()); - aMsg = aMsg.replaceFirst("$2",maView->GetItemText(nItemId)); + aMsg = aMsg.replaceFirst("$2",maView->getRegionItemName(nItemId)); ErrorBox(this,WB_OK,aMsg.replaceFirst("$1",aTemplateList)).Execute(); } } @@ -1577,7 +1577,7 @@ void SfxTemplateManagerDlg::localSearchMoveTo(sal_uInt16 nMenuId) if (!aTemplateList.isEmpty()) { - OUString aDst = maView->GetItemText(nItemId); + OUString aDst = maView->getRegionItemName(nItemId); OUString aMsg(SfxResId(STR_MSG_ERROR_LOCAL_MOVE).toString()); aMsg = aMsg.replaceFirst("$1",aDst); ErrorBox(this, WB_OK,aMsg.replaceFirst( "$2",aTemplateList)).Execute(); |