diff options
| author | Tzvetelina Tzeneva <tzvetelina@gmail.com> | 2011-12-22 17:27:32 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2011-12-22 17:53:53 +0100 |
| commit | 062eaeffe7cb986255063bb9b0a5f3fb3fc8e34c (patch) | |
| tree | 0f065352d000a11131203cf6832354bde597ff50 /xmloff/inc | |
| parent | 61329db01af7fd7c5915a4d81896d52fda7168db (diff) | |
sw: Improved document comparison based on RSIDs.
Diffstat (limited to 'xmloff/inc')
| -rw-r--r-- | xmloff/inc/xmloff/xmltoken.hxx | 2 | ||||
| -rw-r--r-- | xmloff/inc/xmloff/xmltypes.hxx | 1 | ||||
| -rw-r--r-- | xmloff/inc/xmloff/xmluconv.hxx | 7 |
3 files changed, 10 insertions, 0 deletions
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx index b609dad06faa..3a07e309c999 100644 --- a/xmloff/inc/xmloff/xmltoken.hxx +++ b/xmloff/inc/xmloff/xmltoken.hxx @@ -1498,6 +1498,8 @@ namespace xmloff { namespace token { XML_ROW_HEIGHT, XML_ROW_NUMBER, XML_ROWS, + XML_RSID, + XML_PARRSID, XML_RUBY, XML_RUBY_ALIGN, XML_RUBY_BASE, diff --git a/xmloff/inc/xmloff/xmltypes.hxx b/xmloff/inc/xmloff/xmltypes.hxx index 922ad3f340d0..9aee08b6fc59 100644 --- a/xmloff/inc/xmloff/xmltypes.hxx +++ b/xmloff/inc/xmloff/xmltypes.hxx @@ -152,6 +152,7 @@ #define XML_TYPE_NEG_PERCENT8 0x00002022 // (100-x)% #define XML_TYPE_NEG_PERCENT16 0x00002023 // (100-x) #define XML_TYPE_DOUBLE_PERCENT 0x00002024 // 50% (source is a double from 0.0 to 1.0) +#define XML_TYPE_HEX 0x00002025 // 00544F1B // special basic types #define XML_TYPE_RECTANGLE_LEFT 0x00000100 // the Left member of a awt::Rectangle as a measure diff --git a/xmloff/inc/xmloff/xmluconv.hxx b/xmloff/inc/xmloff/xmluconv.hxx index 003fe8c8e021..7e9a460be64c 100644 --- a/xmloff/inc/xmloff/xmluconv.hxx +++ b/xmloff/inc/xmloff/xmluconv.hxx @@ -247,6 +247,13 @@ public: ::rtl::OUString encodeStyleName( const ::rtl::OUString& rName, sal_Bool *pEncoded=0 ) const; + /** convert string (hex) to number (sal_uInt32) */ + static sal_Bool convertHex( sal_uInt32& nVal, + const ::rtl::OUString& rValue ); + + /** convert number (sal_uInt32) to string (hex) */ + static void convertHex( ::rtl::OUStringBuffer& rBuffer, + sal_uInt32 nVal ); }; |