[ooo-build-commit] .: 2 commits - canvas/source psprint_config/prj

[Caolán McNamara]

 canvas/source/cairo/cairo_textlayout.cxx |    4 ++--
 psprint_config/prj/build.lst             |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 74dff8ebf7e7ca28812a01d4c9bbd8f10f36ee85
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 5 11:06:57 2010 +0100

    add some configure options to control external libtextcat and libtextcat data

diff --git a/psprint_config/prj/build.lst b/psprint_config/prj/build.lst
index b2dea37..697fcf6 100644
--- a/psprint_config/prj/build.lst
+++ b/psprint_config/prj/build.lst
@@ -1,4 +1,4 @@
-pc	psprint_config	: soltools afms NULL
+pc	psprint_config	: soltools AFMS:afms NULL
 pc	psprint_config							usr1	-	all	pc_mkout NULL
 pc	psprint_config\configuration			nmake   -   u	pc_conf NULL
 pc	psprint_config\configuration\ppds		nmake	-	u	pc_ppds NULL
commit dfdb40b698f3c4fb1af22c027ce3cf91d99e0915
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 5 10:43:00 2010 +0100

    #i113400# Maths brackets misformed in presentation mode

diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 0b9475e..912ede2 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);