summaryrefslogtreecommitdiffstats
path: root/writerfilter
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2011-07-26 00:55:34 +0200
committerMiklos Vajna <vmiklos@frugalware.org>2011-07-29 17:32:40 +0200
commite8b50bde720e434290c5e0ec22014d33b025f7d9 (patch)
tree1a81fb29d7fa1910c66cc2f921cfac63910133bc /writerfilter
parentimplement RTF_ATNDATE (diff)
downloadcore-e8b50bde720e434290c5e0ec22014d33b025f7d9.tar.gz
core-e8b50bde720e434290c5e0ec22014d33b025f7d9.zip
dmapper: handle redline authors inside annotation fields
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx12
1 files changed, 9 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f36f09b6be29..285670fd7fd2 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3186,9 +3186,15 @@ sal_Int32 DomainMapper_Impl::GetCurrentRedlineToken( )
void DomainMapper_Impl::SetCurrentRedlineAuthor( rtl::OUString sAuthor )
{
- RedlineParamsPtr pCurrent( GetTopRedline( ) );
- if ( pCurrent.get( ) )
- pCurrent->m_sAuthor = sAuthor;
+ if (!m_xAnnotationField.is())
+ {
+ RedlineParamsPtr pCurrent( GetTopRedline( ) );
+ if ( pCurrent.get( ) )
+ pCurrent->m_sAuthor = sAuthor;
+ }
+ else
+ m_xAnnotationField->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Author")),
+ uno::makeAny(sAuthor));
}
void DomainMapper_Impl::SetCurrentRedlineDate( rtl::OUString sDate )