diff options
author | Pranav Kant <pranavk@collabora.co.uk> | 2017-02-21 16:05:02 +0530 |
---|---|---|
committer | pranavk <pranavk@collabora.co.uk> | 2017-02-21 13:29:07 +0000 |
commit | 1b4ce7cd8e4c1e1732ee6434cadd29cb23583a54 (patch) | |
tree | 81287485edde3ea2ceb543fa49484121aae13f1b /sd/source | |
parent | tdf#106049 Apply proper constraints for Calc function T.INV. (diff) | |
download | core-1b4ce7cd8e4c1e1732ee6434cadd29cb23583a54.tar.gz core-1b4ce7cd8e4c1e1732ee6434cadd29cb23583a54.zip |
sd lok: Support editing annotations by id + unit test
Change-Id: Id4faf59eab8c72a2d78157bca15a5e07f9622dde
Reviewed-on: https://gerrit.libreoffice.org/34512
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Diffstat (limited to 'sd/source')
-rw-r--r-- | sd/source/ui/annotations/annotationmanager.cxx | 44 | ||||
-rw-r--r-- | sd/source/ui/annotations/annotationmanagerimpl.hxx | 1 |
2 files changed, 44 insertions, 1 deletions
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index e4d593f36562..9edbb70efb3a 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -354,6 +354,9 @@ void AnnotationManagerImpl::ExecuteAnnotation(SfxRequest& rReq ) case SID_DELETEALLBYAUTHOR_POSTIT: ExecuteDeleteAnnotation( rReq ); break; + case SID_EDIT_POSTIT: + ExecuteEditAnnotation( rReq ); + break; case SID_PREVIOUS_POSTIT: case SID_NEXT_POSTIT: SelectNextAnnotation( rReq.GetSlot() == SID_NEXT_POSTIT ); @@ -434,6 +437,41 @@ void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest& rReq) UpdateTags(); } +void AnnotationManagerImpl::ExecuteEditAnnotation(SfxRequest& rReq) +{ + const SfxItemSet* pArgs = rReq.GetArgs(); + Reference< XAnnotation > xAnnotation; + sal_uInt32 nId = 0; + OUString sText; + if (pArgs) + { + const SfxPoolItem* pPoolItem = nullptr; + if (SfxItemState::SET == pArgs->GetItemState(SID_ATTR_POSTIT_ID, true, &pPoolItem)) + { + nId = static_cast<const SvxPostItIdItem*>(pPoolItem)->GetValue().toUInt32(); + xAnnotation = GetAnnotationById(nId); + } + if (SfxItemState::SET == pArgs->GetItemState(SID_ATTR_POSTIT_TEXT, true, &pPoolItem)) + sText = static_cast<const SfxStringItem*>(pPoolItem)->GetValue(); + + if (xAnnotation.is() && !sText.isEmpty()) + { + // TODO: Not allow other authors to change others' comments ? + Reference<XText> xText(xAnnotation->getTextRange()); + xText->setString(sText); + + const SfxViewShell* pViewShell = SfxViewShell::GetFirst(); + while (pViewShell) + { + lcl_CommentNotification(CommentNotificationType::Modify, pViewShell, xAnnotation); + pViewShell = SfxViewShell::GetNext(*pViewShell); + } + } + } + + UpdateTags(true); +} + void AnnotationManagerImpl::InsertAnnotation(const OUString& rText) { SdPage* pPage = GetCurrentPage(); @@ -719,9 +757,13 @@ void AnnotationManagerImpl::GetAnnotationState(SfxItemSet& rSet) Reference< XAnnotation > xAnnotation; GetSelectedAnnotation( xAnnotation ); - // Don't disable SID_DELETE_POSTIT slot in case of LOK + // Don't disable these slot in case of LOK, as postit doesn't need to + // selected before doing an operation on it in LOK if( (!xAnnotation.is() && !comphelper::LibreOfficeKit::isActive()) || bReadOnly ) + { rSet.DisableItem( SID_DELETE_POSTIT ); + rSet.DisableItem( SID_EDIT_POSTIT ); + } SdPage* pPage = nullptr; diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 03e05cfecbe7..242a7fb6dcfc 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -66,6 +66,7 @@ public: void ExecuteInsertAnnotation(SfxRequest& rReq); void ExecuteDeleteAnnotation(SfxRequest& rReq); + void ExecuteEditAnnotation(SfxRequest& rReq); void ExecuteReplyToAnnotation(SfxRequest& rReq); void SelectNextAnnotation(bool bForeward); |