mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Related: #i123840# normalize SalFrame resolution type to sal_Int32

Browse Source 
(cherry picked from commit 8a7cfd2bded9a531a034222c71ba3eda9df7d436)

Conflicts:
	vcl/aqua/source/gdi/salgdi.cxx
	vcl/aqua/source/gdi/salprn.cxx
	vcl/aqua/source/window/salframe.cxx
	vcl/inc/aqua/salframe.h
	vcl/inc/aqua/salgdi.h
	vcl/inc/os2/salgdi.h
	vcl/os2/source/gdi/salgdi.cxx
	vcl/unx/generic/gdi/salgdi3.cxx

Change-Id: I86f2902d765422b4b850619c72119ad4e03452d7
This commit is contained in:
Herbert Dürr
2013-12-17 15:01:25 +00:00
committed by Caolán McNamara
parent 73a808f6b3
commit 802ca8cd36
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vcl/inc/win/salgdi.h
View File

@@ -277,7 +277,7 @@ public:
// public SalGraphics methods, the interface to the independent vcl part
// get device resolution
virtual void GetResolution( long& rDPIX, long& rDPIY );
virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
// get the depth of the device
virtual sal_uInt16 GetBitCount() const;
// get the width of the device

4
vcl/quartz/salgdicommon.cxx
View File

@@ -1229,8 +1229,8 @@ void AquaSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
initResolution( (mbWindow && mpFrame) ? mpFrame->getNSWindow() : nil );
}
rDPIX = static_cast<sal_Int32>(mfFakeDPIScale * mnRealDPIX);
rDPIY = static_cast<sal_Int32>(mfFakeDPIScale * mnRealDPIY);
rDPIX = lrint( mfFakeDPIScale * mnRealDPIX);
rDPIY = lrint( mfFakeDPIScale * mnRealDPIY);
}
#endif

2
vcl/win/source/gdi/salgdi.cxx
View File

@@ -778,7 +778,7 @@ WinSalGraphics::~WinSalGraphics()
// -----------------------------------------------------------------------
void WinSalGraphics::GetResolution( long& rDPIX, long& rDPIY )
void WinSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
{
rDPIX = GetDeviceCaps( getHDC(), LOGPIXELSX );
rDPIY = GetDeviceCaps( getHDC(), LOGPIXELSY );