diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-16 14:25:56 +0200 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-05 08:17:49 -0500 |
commit | 67ea91dbfd98598017d88c66a455de58f45cb074 (patch) | |
tree | 7f1d081c07ff60548af685aa2abf413bb86be86e /svx/source | |
parent | 9493d3f11ba1f9e08e23ea7a1ffce1654dc264a9 (diff) |
remove UL/L suffixes from shift-by-constant expressions
Change-Id: Ia470f643e3eefeccc14183133603db260460bd53
Reviewed-on: https://gerrit.libreoffice.org/41212
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 224b770fa77fe12ad5dc543ce020aca316b6558d)
(cherry picked from commit 58c171983d4f828d36bf1f6d8fb8329e69424c7e)
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/svdraw/sdrpaintwindow.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdoashp.cxx | 6 | ||||
-rw-r--r-- | svx/source/unodraw/unoshape.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index cbe452b9223c..c3d78ef0eb7f 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -173,7 +173,7 @@ void SdrPreRenderDevice::OutputPreRenderDevice(const vcl::Region& rExpandedRegio int nR = comphelper::rng::uniform_int_distribution(0, 0x7F-1); int nG = comphelper::rng::uniform_int_distribution(0, 0x7F-1); int nB = comphelper::rng::uniform_int_distribution(0, 0x7F-1); - const Color aColor(((((nR|0x80)<<8L)|(nG|0x80))<<8L)|(nB|0x80)); + const Color aColor(((((nR|0x80)<<8)|(nG|0x80))<<8)|(nB|0x80)); mpOutputDevice->SetLineColor(aColor); mpOutputDevice->SetFillColor(); diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 314b4ba319c6..ee4743450126 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -364,9 +364,9 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS { sal_uInt16 nLuminance((sal_uInt16)pReadAccess->GetLuminance(y, x) + 1); const BitmapColor aDestColor( - (sal_uInt8)((nLuminance * (sal_uInt16)aShadowColor.GetRed()) >> 8L), - (sal_uInt8)((nLuminance * (sal_uInt16)aShadowColor.GetGreen()) >> 8L), - (sal_uInt8)((nLuminance * (sal_uInt16)aShadowColor.GetBlue()) >> 8L)); + (sal_uInt8)((nLuminance * (sal_uInt16)aShadowColor.GetRed()) >> 8), + (sal_uInt8)((nLuminance * (sal_uInt16)aShadowColor.GetGreen()) >> 8), + (sal_uInt8)((nLuminance * (sal_uInt16)aShadowColor.GetBlue()) >> 8)); pWriteAccess->SetPixel(y, x, aDestColor); } } diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 76d0dd22a97f..c5e79c0ad634 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -2470,7 +2470,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl { SdrModel* pModel = pPageObj->GetModel(); SdrPage* pNewPage = nullptr; - const sal_uInt16 nDestinationPageNum((sal_uInt16)((nPageNum << 1L) - 1L)); + const sal_uInt16 nDestinationPageNum((sal_uInt16)((nPageNum << 1) - 1L)); if(pModel) { |