diff options
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/Library_rtftok.mk | 1 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 7 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.hxx | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk index b7df627bdffe..73543062e690 100644 --- a/writerfilter/Library_rtftok.mk +++ b/writerfilter/Library_rtftok.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_add_defs,rtftok,\ )) $(eval $(call gb_Library_use_libraries,rtftok,\ + comphelper \ cppu \ cppuhelper \ msfilter \ diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 957174ee37da..93b2812bfdc6 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -48,6 +48,7 @@ #include <vcl/svapp.hxx> #include <filter/msfilter/util.hxx> #include <filter/msfilter/escherex.hxx> +#include <comphelper/string.hxx> #include <doctok/sprmids.hxx> // NS_sprm namespace #include <doctok/resourceids.hxx> // NS_rtf namespace @@ -931,6 +932,7 @@ void RTFDocumentImpl::text(OUString& rString) case DESTINATION_FORMFIELDLIST: case DESTINATION_DATAFIELD: case DESTINATION_AUTHOR: + case DESTINATION_KEYWORDS: case DESTINATION_OPERATOR: case DESTINATION_COMPANY: case DESTINATION_COMMENT: @@ -1306,6 +1308,9 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) case RTF_AUTHOR: m_aStates.top().nDestinationState = DESTINATION_AUTHOR; break; + case RTF_KEYWORDS: + m_aStates.top().nDestinationState = DESTINATION_KEYWORDS; + break; case RTF_OPERATOR: m_aStates.top().nDestinationState = DESTINATION_OPERATOR; break; @@ -3242,6 +3247,8 @@ int RTFDocumentImpl::popState() m_xDocumentProperties->setPrintDate(lcl_getDateTime(m_aStates)); else if (m_aStates.top().nDestinationState == DESTINATION_AUTHOR && m_xDocumentProperties.is()) m_xDocumentProperties->setAuthor(m_aStates.top().aDestinationText.makeStringAndClear()); + else if (m_aStates.top().nDestinationState == DESTINATION_KEYWORDS && m_xDocumentProperties.is()) + m_xDocumentProperties->setKeywords(comphelper::string::convertCommaSeparated(m_aStates.top().aDestinationText.makeStringAndClear())); else if (m_aStates.top().nDestinationState == DESTINATION_COMMENT && m_xDocumentProperties.is()) m_xDocumentProperties->setGenerator(m_aStates.top().aDestinationText.makeStringAndClear()); else if (m_aStates.top().nDestinationState == DESTINATION_OPERATOR diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index 1c7b9ecc9d32..2e23b0d79a26 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -100,6 +100,7 @@ namespace writerfilter { DESTINATION_REVISIONTIME, DESTINATION_PRINTTIME, DESTINATION_AUTHOR, + DESTINATION_KEYWORDS, DESTINATION_OPERATOR, DESTINATION_COMPANY, DESTINATION_COMMENT, |