diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-04-16 02:55:53 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-04-16 02:55:53 +0200 |
| commit | 915303a7903bac1e9a940370e69651dd48d08a01 (patch) | |
| tree | bc92cb64621040bc9ecb83d711032eecf995dc3b /include | |
| parent | 5e239836009390a5f2b4ee4d6dfd42b6032f7cc4 (diff) | |
fix werror problem around sal_uInt32 vs sal_Int32
Change-Id: Ifab0f5ad300882b1a014f6420094e5db503105e3
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/helper/attributelist.hxx | 8 | ||||
| -rw-r--r-- | include/oox/helper/helper.hxx | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/oox/helper/attributelist.hxx b/include/oox/helper/attributelist.hxx index 90059fb3700e..38bdf34a1f95 100644 --- a/include/oox/helper/attributelist.hxx +++ b/include/oox/helper/attributelist.hxx @@ -59,6 +59,9 @@ public: /** Returns the 32-bit signed integer value from the passed string (hexadecimal). */ static sal_Int32 decodeIntegerHex( const OUString& rValue ); + + /** Returns the 32-bit unsigned integer value from the passed string (hexadecimal). */ + static sal_uInt32 decodeUnsignedHex( const OUString& rValue ); }; @@ -109,6 +112,9 @@ public: /** Returns the 32-bit signed integer value of the specified attribute (hexadecimal). */ OptValue< sal_Int32 > getIntegerHex( sal_Int32 nAttrToken ) const; + /** Returns the 32-bit unsigned integer value of the specified attribute (hexadecimal). */ + OptValue< sal_uInt32 > getUnsignedHex( sal_Int32 nAttrToken ) const; + /** Returns the boolean value of the specified attribute. */ OptValue< bool > getBool( sal_Int32 nAttrToken ) const; @@ -152,6 +158,8 @@ public: or the passed default value if the attribute is missing or not convertible. */ sal_Int32 getIntegerHex( sal_Int32 nAttrToken, sal_Int32 nDefault ) const; + sal_uInt32 getUnsignedHex( sal_Int32 nAttrToken, sal_uInt32 nDefault ) const; + /** Returns the boolean value of the specified attribute, or the passed default value if the attribute is missing or not convertible to bool. */ bool getBool( sal_Int32 nAttrToken, bool bDefault ) const; diff --git a/include/oox/helper/helper.hxx b/include/oox/helper/helper.hxx index b19337df8873..9585cc138616 100644 --- a/include/oox/helper/helper.hxx +++ b/include/oox/helper/helper.hxx @@ -77,6 +77,7 @@ const sal_uInt8 WINDOWS_CHARSET_OEM = 255; const sal_Int32 API_RGB_TRANSPARENT = -1; ///< Transparent color for API calls. +const sal_uInt32 UNSIGNED_RGB_TRANSPARENT = static_cast<sal_uInt32>(-1); ///< Transparent color for unsigned int32 places. const sal_Int32 API_RGB_BLACK = 0x000000; ///< Black color for API calls. const sal_Int32 API_RGB_GRAY = 0x808080; ///< Gray color for API calls. const sal_Int32 API_RGB_WHITE = 0xFFFFFF; ///< White color for API calls. |