vcl/source/control/field.cxx | 6 ++++++ vcl/source/window/builder.cxx | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-)
New commits: commit 980bd65857743a59ac882d4a9fdc5d80c7ea103c Author: Caolán McNamara <[email protected]> Date: Wed May 23 13:32:19 2012 +0100 connect up NumericFields with their editboxes diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 2259648..f2de909 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -790,7 +790,10 @@ NumericField::NumericField( Window* pParent, const ResId& rResId ) : SpinField( WINDOW_NUMERICFIELD ) { if (Dialog::replace_buildable(pParent, rResId.GetId(), *this)) + { + SetField( this ); return; + } rResId.SetRT( RSC_NUMERICFIELD ); WinBits nStyle = ImplInitRes( rResId ) ; @@ -1660,7 +1663,10 @@ MetricField::MetricField( Window* pParent, const ResId& rResId ) : SpinField( WINDOW_METRICFIELD ) { if (Dialog::replace_buildable(pParent, rResId.GetId(), *this)) + { + SetField( this ); return; + } rResId.SetRT( RSC_METRICFIELD ); WinBits nStyle = ImplInitRes( rResId ) ; diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index edbae65..ab2a776 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -189,7 +189,10 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, const pWindow = new Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK ); else fprintf(stderr, "TO-DO, implement %s\n", name.getStr()); - fprintf(stderr, "for %s, created %p child of %p (%p/%p/%p)\n", name.getStr(), pWindow, pParent, pWindow->mpWindowImpl->mpParent, pWindow->mpWindowImpl->mpRealParent, pWindow->mpWindowImpl->mpBorderWindow); + if (pWindow) + { + fprintf(stderr, "for %s, created %p child of %p (%p/%p/%p)\n", name.getStr(), pWindow, pParent, pWindow->mpWindowImpl->mpParent, pWindow->mpWindowImpl->mpRealParent, pWindow->mpWindowImpl->mpBorderWindow); + } return pWindow; }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
