strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#75280: Convert inappropriate use of sal_uIntPtr to better integer types

Browse source 
I fixed if-conditons in UnoGraphicExporter.cxx and I deleted extra slash character at start of zcodec.cxx file.

Change-Id: I464e7b0dcbfe835d04c5031bfbd6e46bccbb1216
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87470
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
This commit is contained in:
Canberk TURAN 2020-01-27 01:51:19 +03:00 committed by Michael Stahl
parent aca3cfb711
commit 9e0470da4a
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
svx/source/unodraw/UnoGraphicExporter.cxx
View file

@ -159,7 +159,7 @@ namespace {
virtual sal_Bool SAL_CALL supportsMimeType( const OUString& MimeTypeName ) override;
virtual Sequence< OUString > SAL_CALL getSupportedMimeTypeNames( ) override;
VclPtr<VirtualDevice> CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWidthPixel, sal_uIntPtr nHeightPixel ) const;
VclPtr<VirtualDevice> CreatePageVDev( SdrPage* pPage, long nWidthPixel, long nHeightPixel ) const;
DECL_LINK( CalcFieldValueHdl, EditFieldInfo*, void );
@ -381,7 +381,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo, void)
@return the returned VirtualDevice is owned by the caller
*/
VclPtr<VirtualDevice> GraphicExporter::CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWidthPixel, sal_uIntPtr nHeightPixel ) const
VclPtr<VirtualDevice> GraphicExporter::CreatePageVDev( SdrPage* pPage, long nWidthPixel, long nHeightPixel ) const
{
VclPtr<VirtualDevice> pVDev = VclPtr<VirtualDevice>::Create();
MapMode aMM( MapUnit::Map100thMM );
@ -390,9 +390,9 @@ VclPtr<VirtualDevice> GraphicExporter::CreatePageVDev( SdrPage* pPage, sal_uIntP
Size aPageSize(pPage->GetSize());
// use scaling?
if( nWidthPixel )
if( nWidthPixel != 0 )
{
const Fraction aFrac( static_cast<long>(nWidthPixel), pVDev->LogicToPixel( aPageSize, aMM ).Width() );
const Fraction aFrac( nWidthPixel, pVDev->LogicToPixel( aPageSize, aMM ).Width() );
aMM.SetScaleX( aFrac );
@ -400,9 +400,9 @@ VclPtr<VirtualDevice> GraphicExporter::CreatePageVDev( SdrPage* pPage, sal_uIntP
aMM.SetScaleY( aFrac );
}
if( nHeightPixel )
if( nHeightPixel != 0 )
{
const Fraction aFrac( static_cast<long>(nHeightPixel), pVDev->LogicToPixel( aPageSize, aMM ).Height() );
const Fraction aFrac( nHeightPixel, pVDev->LogicToPixel( aPageSize, aMM ).Height() );
if( nWidthPixel == 0 )
aMM.SetScaleX( aFrac );

4
tools/source/zcodec/zcodec.cxx
View file

@ -287,9 +287,9 @@ long ZCodec::ReadAsynchron( SvStream& rIStm, sal_uInt8* pData, sal_uInt32 nSize
void ZCodec::ImplWriteBack()
{
auto pStream = static_cast<z_stream*>(mpsC_Stream);
sal_uIntPtr nAvail = mnOutBufSize - pStream->avail_out;
size_t nAvail = mnOutBufSize - pStream->avail_out;
if ( nAvail )
if ( nAvail > 0 )
{
pStream->next_out = mpOutBuf;
mpOStm->WriteBytes( mpOutBuf, nAvail );