diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-04-25 22:05:16 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-04-27 14:00:49 +0200 |
| commit | ba25977a133872c4a843f51e3d9aa4e0ac831b01 (patch) | |
| tree | 949996a63b5bfa85292995e7a0a366566a176cfe /sw | |
| parent | a1ccf268b3960108c6c587bc1debe0f0281e1656 (diff) | |
sal_uInt16 to sal_Int16
Change-Id: I1489cce08cff99d9a1c15d30a8ad54cca293dc71
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8toolbar.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index 793a77c63c10..98d433f93fc8 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -664,13 +664,13 @@ SwTBC::ImportToolBarControl( SwCTBWrapper& rWrapper, const css::uno::Reference< // cmtAllocated 0x3 Allocated command. See CidAllocated. // cmtNil 0x7 No command. See Cid. bool bBuiltin = false; - sal_uInt16 cmdId = 0; + sal_Int16 cmdId = 0; if ( cid.get() ) { - sal_uInt16 arg2 = ( *( cid.get() ) & 0xFFFF ); + const sal_uInt32 nCid = ( *( cid.get() ) & 0xFFFF ); - sal_uInt8 cmt = ( arg2 & 0x7 ); - arg2 = ( arg2 >> 3 ); + const sal_uInt8 cmt = static_cast<sal_uInt8>( nCid & 0x7 ); + const sal_Int16 arg2 = static_cast<sal_Int16>( nCid >> 3 ); switch ( cmt ) { |