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 /sc | |
| parent | 5e239836009390a5f2b4ee4d6dfd42b6032f7cc4 (diff) | |
fix werror problem around sal_uInt32 vs sal_Int32
Change-Id: Ifab0f5ad300882b1a014f6420094e5db503105e3
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/inc/condformatbuffer.hxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/oox/condformatbuffer.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx index 31ae39ab0295..18523d8675d7 100644 --- a/sc/source/filter/inc/condformatbuffer.hxx +++ b/sc/source/filter/inc/condformatbuffer.hxx @@ -219,7 +219,7 @@ private: struct ExCfRuleModel { - ExCfRuleModel() : mbGradient( false ), mnAxisColor( API_RGB_TRANSPARENT ), mnNegativeColor( API_RGB_TRANSPARENT ), mbIsLower( true ) {} + ExCfRuleModel() : mbGradient( false ), mnAxisColor( UNSIGNED_RGB_TRANSPARENT ), mnNegativeColor( UNSIGNED_RGB_TRANSPARENT ), mbIsLower( true ) {} // DataBar bool mbGradient; OUString maAxisPosition; diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index 7e0a0f5a1194..08ea8005d322 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -177,7 +177,7 @@ void ColorScaleRule::importColor( const AttributeList& rAttribs ) { sal_uInt32 nColor = 0; if( rAttribs.hasAttribute( XML_rgb ) ) - nColor = rAttribs.getIntegerHex( XML_rgb, API_RGB_TRANSPARENT ); + nColor = rAttribs.getUnsignedHex( XML_rgb, UNSIGNED_RGB_TRANSPARENT ); else if( rAttribs.hasAttribute( XML_theme ) ) { sal_uInt32 nThemeIndex = rAttribs.getUnsigned( XML_theme, 0 ); @@ -254,7 +254,7 @@ void DataBarRule::importColor( const AttributeList& rAttribs ) { sal_uInt32 nColor = 0; if( rAttribs.hasAttribute( XML_rgb ) ) - nColor = rAttribs.getIntegerHex( XML_rgb, API_RGB_TRANSPARENT ); + nColor = rAttribs.getUnsignedHex( XML_rgb, UNSIGNED_RGB_TRANSPARENT ); else if( rAttribs.hasAttribute( XML_theme ) ) { sal_uInt32 nThemeIndex = rAttribs.getUnsigned( XML_theme, 0 ); @@ -1194,13 +1194,13 @@ void ExtCfRule::importDataBar( const AttributeList& rAttribs ) void ExtCfRule::importNegativeFillColor( const AttributeList& rAttribs ) { mnRuleType = NEGATIVEFILLCOLOR; - maModel.mnNegativeColor = rAttribs.getIntegerHex( XML_rgb, API_RGB_TRANSPARENT ); + maModel.mnNegativeColor = rAttribs.getUnsignedHex( XML_rgb, UNSIGNED_RGB_TRANSPARENT ); } void ExtCfRule::importAxisColor( const AttributeList& rAttribs ) { mnRuleType = AXISCOLOR; - maModel.mnAxisColor = rAttribs.getIntegerHex( XML_rgb, API_RGB_TRANSPARENT ); + maModel.mnAxisColor = rAttribs.getUnsignedHex( XML_rgb, UNSIGNED_RGB_TRANSPARENT ); } void ExtCfRule::importCfvo( const AttributeList& rAttribs ) |