diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-01-11 13:21:22 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-01-11 14:02:46 +0200 |
commit | fc4003e960340d6ace29c59b6d9f00f5b19308b0 (patch) | |
tree | d9f3e711d9cd2da05d9d20d970d23e740f805b18 /sw/source/filter | |
parent | 066bdb31f7ff801b7a36c79c43ecbd527ffb2a88 (diff) |
Make the LIBO_VERSION_* macros integers, not strings
Change-Id: I6083de4a3f88d50cf4e923aa7fb495fe1711b632
Diffstat (limited to 'sw/source/filter')
-rw-r--r-- | sw/source/filter/ww8/rtfexport.cxx | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 1b211b8e134f..80085edf7732 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -408,12 +408,22 @@ void RtfExport::WriteInfo() OutUnicode(OOO_STRING_SVTOOLS_RTF_AUTHOR,xDocProps->getModifiedBy()); OutDateTime(OOO_STRING_SVTOOLS_RTF_REVTIM, xDocProps->getModificationDate()); + OutDateTime(OOO_STRING_SVTOOLS_RTF_PRINTIM, xDocProps->getPrintDate()); } Strm() << '{' << OOO_STRING_SVTOOLS_RTF_COMMENT << " "; Strm() << OUStringToOString( utl::ConfigManager::getProductName(), eCurrentEncoding).getStr() << "}{" << OOO_STRING_SVTOOLS_RTF_VERN; - Strm() << LIBO_VERSION_MAJOR LIBO_VERSION_MINOR LIBO_VERSION_MICRO "0" << '}'; + +// The convention that we follow is that the version number +// should be a non-negative 32-bit int +#if LIBO_VERSION_MAJOR > 127 +#error Major version number must be less than 128 +#elif LIBO_VERSION_MINOR > 255 || LIBO_VERSION_MICRO > 255 || LIBO_VERSION_PATCH > 255 +#error Minor, micro and patchlevel version numbers must be less than 256 +#endif + + Strm() << (sal_Int32) LIBO_VERSION_ENCODED_IN_32BITS << '}'; Strm() << '}'; } |