diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2010-08-30 15:20:46 +0100 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2010-08-30 15:20:46 +0100 |
| commit | 970139fb34ad299bbafe13c30e86810e57af8969 (patch) | |
| tree | d9a8207a5a482bccb00d56e833759c5f58830e0a /canvas | |
| parent | b06645b8dc544d13a46edb2635a4c97e5a782f70 (diff) | |
| parent | fa4b286294a272b085c2f74e12581edc2343fc18 (diff) | |
cmcfixes78: merge with DEV300 m87
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/cairo/cairo_textlayout.cxx | 4 | ||||
| -rw-r--r-- | canvas/source/tools/elapsedtime.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index dfe2071c3726..d0873b63f5f0 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -521,8 +521,8 @@ namespace cairocanvas nWidth = aFont.GetHeight(); } else { // any scaling needs to be relative to the platform-dependent definition - // of width of the font - nWidth = aFont.GetHeight() * aFont.GetWidth() / aMetric.GetWidth(); + // of height of the font + nWidth = aFont.GetWidth() * aFont.GetHeight() / aMetric.GetHeight(); } cairo_matrix_init_identity(&m); diff --git a/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx index 6ca58a2bf1ee..6c3d3284cb82 100644 --- a/canvas/source/tools/elapsedtime.cxx +++ b/canvas/source/tools/elapsedtime.cxx @@ -32,7 +32,7 @@ #include "osl/diagnose.h" #include "canvas/elapsedtime.hxx" -#if defined(WIN) || defined(WNT) +#if defined(WNT) #if defined _MSC_VER #pragma warning(push,1) @@ -58,7 +58,7 @@ namespace canvas { namespace tools { -#if defined(WIN) || defined(WNT) +#if defined(WNT) // TODO(Q2): is 0 okay for the failure case here? double ElapsedTime::getSystemTime() { |