Kaydet (Commit) 802ca8cd authored tarafından Herbert Dürr's avatar Herbert Dürr Kaydeden (comit) Caolán McNamara

Related: #i123840# normalize SalFrame resolution type to sal_Int32

(cherry picked from commit 8a7cfd2b)

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
üst 73a808f6
...@@ -277,7 +277,7 @@ public: ...@@ -277,7 +277,7 @@ public:
// public SalGraphics methods, the interface to the independent vcl part // public SalGraphics methods, the interface to the independent vcl part
// get device resolution // 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 // get the depth of the device
virtual sal_uInt16 GetBitCount() const; virtual sal_uInt16 GetBitCount() const;
// get the width of the device // get the width of the device
......
...@@ -1229,8 +1229,8 @@ void AquaSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) ...@@ -1229,8 +1229,8 @@ void AquaSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
initResolution( (mbWindow && mpFrame) ? mpFrame->getNSWindow() : nil ); initResolution( (mbWindow && mpFrame) ? mpFrame->getNSWindow() : nil );
} }
rDPIX = static_cast<sal_Int32>(mfFakeDPIScale * mnRealDPIX); rDPIX = lrint( mfFakeDPIScale * mnRealDPIX);
rDPIY = static_cast<sal_Int32>(mfFakeDPIScale * mnRealDPIY); rDPIY = lrint( mfFakeDPIScale * mnRealDPIY);
} }
#endif #endif
......
...@@ -778,7 +778,7 @@ WinSalGraphics::~WinSalGraphics() ...@@ -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 ); rDPIX = GetDeviceCaps( getHDC(), LOGPIXELSX );
rDPIY = GetDeviceCaps( getHDC(), LOGPIXELSY ); rDPIY = GetDeviceCaps( getHDC(), LOGPIXELSY );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment