diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-02-20 15:12:40 +0530 |
|---|---|---|
| committer | Pranav Kant <pranavk@collabora.co.uk> | 2017-02-20 20:55:06 +0530 |
| commit | 7cc5aca1901ca7d67dffdcfc29537f32c31e0235 (patch) | |
| tree | 39cf310977290b2c9fa53973706f87a25a12a11c /sd | |
| parent | b02416ea4742873153227b6eaca00a15e7335987 (diff) | |
sd lok: use per view author in annotations reply too
Change-Id: Ibc727b54ebfcbdd1c95b679a35ddc8878ceecbfd
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/annotations/annotationmanager.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 5b7b3246faaf..8d8c88304d1c 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -597,10 +597,17 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) std::unique_ptr< OutlinerParaObject > pOPO( pOutliner->CreateParaObject() ); pTextApi->SetText( *pOPO.get() ); - SvtUserOptions aUserOptions; - xAnnotation->setAuthor( aUserOptions.GetFullName() ); - xAnnotation->setInitials( aUserOptions.GetID() ); + OUString sReplyAuthor; + if (comphelper::LibreOfficeKit::isActive()) + sReplyAuthor = mrBase.GetMainViewShell()->GetView()->GetAuthor(); + else + { + SvtUserOptions aUserOptions; + sReplyAuthor = aUserOptions.GetFullName(); + xAnnotation->setInitials( aUserOptions.GetID() ); + } + xAnnotation->setAuthor( sReplyAuthor ); // set current time to reply xAnnotation->setDateTime( getCurrentDateTime() ); |