summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2003-08-25 12:57:30 +0000
committerKurt Zenker <kz@openoffice.org>2003-08-25 12:57:30 +0000
commit1090e32fab5ed4d5dfe6289e8830894312c45911 (patch)
tree6dddc4077232cbffe8eae2eb511a2e23fd84dd0f /vcl/unx
parent8dfee50b99c2c97b86966ab32df6eaf3689769d1 (diff)
INTEGRATION: CWS vcl15 (1.24.78); FILE MERGED
2003/07/09 12:53:56 pl 1.24.78.1: #i15507# prefer Xft font resolution
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/source/gdi/salgdi.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/source/gdi/salgdi.cxx b/vcl/unx/source/gdi/salgdi.cxx
index e45bc70142ee..d0a001da9873 100644
--- a/vcl/unx/source/gdi/salgdi.cxx
+++ b/vcl/unx/source/gdi/salgdi.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: salgdi.cxx,v $
*
- * $Revision: 1.24 $
+ * $Revision: 1.25 $
*
- * last change: $Author: vg $ $Date: 2003-04-15 16:09:37 $
+ * last change: $Author: kz $ $Date: 2003-08-25 13:57:30 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -504,7 +504,7 @@ void SalGraphics::GetResolution( long &rDPIX, long &rDPIY ) // const
rDPIX = pDisplay->GetResolution().A();
rDPIY = pDisplay->GetResolution().B();
- if ( rDPIY < 96 )
+ if( !pDisplay->GetExactResolution() && rDPIY < 96 )
{
rDPIX = Divide( rDPIX * 96, rDPIY );
rDPIY = 96;