summaryrefslogtreecommitdiff
path: root/toolkit/source
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2008-01-14 11:56:48 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2008-01-14 11:56:48 +0000
commitb9425de50c332bc4f26bd3ab45b46b65581e87d1 (patch)
treeb0340358071dfdf91ec397604ff96cc7d7044a42 /toolkit/source
parent635e9296ff3817b78577408eb3262ffeaf24c13f (diff)
INTEGRATION: CWS awtfixes1 (1.57.24); FILE MERGED
2007/12/10 19:22:40 jcn 1.57.24.3: RESYNC: (1.64-1.66); FILE MERGED 2007/11/29 19:01:00 fridrich_strba 1.57.24.2: RESYNC: (1.57-1.64); FILE MERGED 2007/11/02 10:56:03 jcn 1.57.24.1: Issue number: i#83222# Submitted by: jcn Reviewed by: mmeeks Apply layout-toolkit-metric-field.diff. Adds VCLXMetricField implementation and use it for WINDOW_METRICFIELD instead of VCLXSpinField.
Diffstat (limited to 'toolkit/source')
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 0ffd3d360a5e..667b6f9f309e 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: vclxtoolkit.cxx,v $
*
- * $Revision: 1.66 $
+ * $Revision: 1.67 $
*
- * last change: $Author: vg $ $Date: 2007-12-10 09:46:08 $
+ * last change: $Author: ihi $ $Date: 2008-01-14 12:56:48 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -873,7 +873,8 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
break;
case WINDOW_METRICFIELD:
pNewWindow = new MetricField( pParent, nWinBits );
- *ppNewComp = new VCLXSpinField;
+ *ppNewComp = new VCLXMetricField;
+ ((VCLXFormattedSpinField*)*ppNewComp)->SetFormatter( (FormatterBase*)(MetricField*)pNewWindow );
break;
case WINDOW_DIALOG:
case WINDOW_MODALDIALOG: