diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2013-02-11 18:09:45 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-02-13 08:54:10 +0000 |
| commit | 1a6ae8e83df22deca193c58bc940d1dc265eb4b8 (patch) | |
| tree | f59a78a713df734f71f58015aa0043a4bf6f9545 /sfx2/source | |
| parent | 0b1deadc72eca6f782a5bb3a180d6f1d95f52721 (diff) | |
Templates Manager: if the title can't be edited, don't update it in UI
Change-Id: Id16431fb3517c831a5e81ff72fafaa8569f99ef1
Reviewed-on: https://gerrit.libreoffice.org/2109
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/control/templatelocalview.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/control/templateview.cxx | 5 | ||||
| -rw-r--r-- | sfx2/source/control/thumbnailview.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/control/thumbnailviewitem.cxx | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index 2bbf0d0741a5..ca8856ece221 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -605,7 +605,7 @@ void TemplateLocalView::OnItemDblClicked (ThumbnailViewItem *pRegionItem) showOverlay(true); } -void TemplateLocalView::renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle) +bool TemplateLocalView::renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle) { sal_uInt16 nRegionId = 0; sal_uInt16 nDocId = USHRT_MAX; @@ -620,7 +620,7 @@ void TemplateLocalView::renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewT { nRegionId = pContainerItem->mnId - 1; } - mpDocTemplates->SetName( sNewTitle, nRegionId, nDocId ); + return mpDocTemplates->SetName( sNewTitle, nRegionId, nDocId ); } static void lcl_updateThumbnails (TemplateContainerItem *pItem) diff --git a/sfx2/source/control/templateview.cxx b/sfx2/source/control/templateview.cxx index 90e86ecb1aed..615465df3862 100644 --- a/sfx2/source/control/templateview.cxx +++ b/sfx2/source/control/templateview.cxx @@ -105,10 +105,11 @@ void TemplateView::OnItemDblClicked(ThumbnailViewItem *pItem) maDblClickHdl.Call(pItem); } -void TemplateView::renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle) +bool TemplateView::renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle) { if (mpMasterView) - mpMasterView->renameItem(pItem, sNewTitle); + return mpMasterView->renameItem(pItem, sNewTitle); + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 9a29381f5ab2..c996f0fad30a 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -980,9 +980,10 @@ void ThumbnailView::sortItems (const boost::function<bool (const ThumbnailViewIt Invalidate(); } -void ThumbnailView::renameItem(ThumbnailViewItem*, rtl::OUString) +bool ThumbnailView::renameItem(ThumbnailViewItem*, rtl::OUString) { // Do nothing by default + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index c228babd21c5..2a83bc175774 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -187,8 +187,8 @@ void ThumbnailViewItem::updateTitleEditSize() void ThumbnailViewItem::setTitle (const rtl::OUString& rTitle) { - mrParent.renameItem(this, rTitle); - maTitle = rTitle; + if (mrParent.renameItem(this, rTitle)) + maTitle = rTitle; } uno::Reference< accessibility::XAccessible > ThumbnailViewItem::GetAccessible( bool bIsTransientChildrenDisabled ) |