Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

* commit 'ooo/DEV300_m101': (185 commits)
masterfix DEV300: #i10000# usage of L10N build_type
masterfix: #i10000# INT16 -> sal_Int16
fixed compile errors after resync to m100, part2
gridsort: post-rebase fixes
CWS gnumake3: found another tools integer type
removetooltypes01: Fix build problems after rebase to DEV300m99 in basctl, cui, reportdesign, sw
native359: #i114398# changing mac langpack icon
native359: #i115669# fixing package description for solaris packages
gnumake3: remove comphelper version; fix including extract.hxx
locales34: #i106785# add Haitian_Haiti [ht-HT] to language list and locale data; locale data contributed by <jcpoulard>
sb138: #i116659# timely termination of OnLogRotateThread
accfixes: removed include of obsolete header file
accfixes: removed obsolete file
removetooltypes01: #i112600# Fix build problems on non-pro
accfixes: moved some shared strings to svx part2
accfixes: moved some shared strings to svx
accfixes: added more accessibility information and fixed tab orders in multiple dialogs (cui module)
removetooltypes01: #i112600# Remove tools types for Mac specific parts
fixed tab order in BasicIDE, Library dialog tab page
added some accessible names in BasicIDE
...

Conflicts:
UnoControls/source/base/registercontrols.cxx
accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
automation/inc/automation/communi.hxx
automation/inc/automation/simplecm.hxx
automation/source/communi/communi.cxx
automation/source/inc/rcontrol.hxx
automation/source/miniapp/servuid.hxx
automation/source/server/XMLParser.cxx
automation/source/server/cmdbasestream.cxx
automation/source/server/profiler.hxx
automation/source/server/recorder.cxx
automation/source/server/retstrm.hxx
automation/source/server/server.cxx
automation/source/server/sta_list.cxx
automation/source/server/statemnt.cxx
automation/source/server/statemnt.hxx
automation/source/simplecm/packethandler.cxx
automation/source/simplecm/simplecm.cxx
automation/source/simplecm/tcpio.cxx
automation/source/simplecm/tcpio.hxx
automation/source/testtool/comm_bas.hxx
automation/source/testtool/cretstrm.hxx
automation/source/testtool/httprequest.cxx
automation/source/testtool/httprequest.hxx
automation/source/testtool/objtest.cxx
automation/source/testtool/objtest.hxx
basctl/source/basicide/baside2.cxx
basctl/source/basicide/baside2.hxx
basctl/source/basicide/baside2b.cxx
basctl/source/basicide/baside3.cxx
basctl/source/basicide/basides1.cxx
basctl/source/basicide/basides2.cxx
basctl/source/basicide/basidesh.cxx
basctl/source/basicide/basidesh.src
basctl/source/basicide/basobj3.cxx
basctl/source/basicide/bastype2.cxx
basctl/source/basicide/bastype3.cxx
basctl/source/basicide/bastypes.cxx
basctl/source/basicide/brkdlg.cxx
basctl/source/basicide/iderdll.cxx
basctl/source/basicide/macrodlg.cxx
basctl/source/basicide/moduldl2.cxx
basctl/source/basicide/moduldlg.cxx
basctl/source/basicide/objdlg.cxx
basctl/source/basicide/scriptdocument.cxx
basctl/source/basicide/tbxctl.cxx
basctl/source/basicide/tbxctl.hxx
basctl/source/basicide/tbxctl.src
basctl/source/dlged/dlged.cxx
basctl/source/dlged/dlgedfunc.cxx
basctl/source/dlged/dlgedobj.cxx
basctl/source/inc/basidesh.hxx
basctl/source/inc/bastypes.hxx
basctl/source/inc/dlgedmod.hxx
basctl/source/inc/dlgedpage.hxx
crashrep/prj/build.lst
cui/inc/pch/precompiled_cui.hxx
cui/source/customize/acccfg.cxx
cui/source/customize/acccfg.hrc
cui/source/customize/acccfg.src
cui/source/customize/cfg.cxx
cui/source/customize/cfgutil.cxx
cui/source/customize/macropg.cxx
cui/source/customize/macropg.src
cui/source/customize/selector.cxx
cui/source/dialogs/SpellDialog.cxx
cui/source/dialogs/commonlingui.cxx
cui/source/dialogs/cuicharmap.cxx
cui/source/dialogs/cuifmsearch.cxx
cui/source/dialogs/cuigaldlg.cxx
cui/source/dialogs/cuigrfflt.cxx
cui/source/dialogs/hldocntp.cxx
cui/source/dialogs/hldoctp.cxx
cui/source/dialogs/hlinettp.cxx
cui/source/dialogs/hlmailtp.cxx
cui/source/dialogs/hlmarkwn.cxx
cui/source/dialogs/hlmarkwn.src
cui/source/dialogs/hltpbase.cxx
cui/source/dialogs/iconcdlg.cxx
cui/source/dialogs/passwdomdlg.cxx
cui/source/dialogs/pastedlg.cxx
cui/source/dialogs/scriptdlg.cxx
cui/source/dialogs/thesdlg.cxx
cui/source/dialogs/zoom.cxx
cui/source/factory/dlgfact.hxx
cui/source/inc/SpellDialog.hxx
cui/source/inc/autocdlg.hxx
cui/source/inc/backgrnd.hxx
cui/source/inc/bbdlg.hxx
cui/source/inc/cfg.hxx
cui/source/inc/cfgutil.hxx
cui/source/inc/cuigaldlg.hxx
cui/source/inc/cuigrfflt.hxx
cui/source/inc/cuitabarea.hxx
cui/source/inc/cuitabline.hxx
cui/source/inc/hldocntp.hxx
cui/source/inc/hltpbase.hxx
cui/source/inc/iconcdlg.hxx
cui/source/inc/numpages.hxx
cui/source/inc/page.hxx
cui/source/inc/postdlg.hxx
cui/source/inc/scriptdlg.hxx
cui/source/inc/transfrm.hxx
cui/source/inc/zoom.hxx
cui/source/options/cfgchart.cxx
cui/source/options/cuisrchdlg.cxx
cui/source/options/dbregister.cxx
cui/source/options/dbregister.src
cui/source/options/fontsubs.cxx
cui/source/options/internationaloptions.cxx
cui/source/options/optasian.cxx
cui/source/options/optchart.cxx
cui/source/options/optcolor.cxx
cui/source/options/optcolor.src
cui/source/options/optfltr.cxx
cui/source/options/optfltr.src
cui/source/options/optgdlg.cxx
cui/source/options/optgdlg.src
cui/source/options/optgenrl.cxx
cui/source/options/opthtml.cxx
cui/source/options/optimprove.cxx
cui/source/options/optinet2.cxx
cui/source/options/optinet2.hxx
cui/source/options/optjava.cxx
cui/source/options/optlingu.cxx
cui/source/options/optsave.cxx
cui/source/options/optsave.hxx
cui/source/options/treeopt.cxx
cui/source/options/webconninfo.cxx
cui/source/tabpages/autocdlg.cxx
cui/source/tabpages/backgrnd.cxx
cui/source/tabpages/border.cxx
cui/source/tabpages/chardlg.cxx
cui/source/tabpages/dstribut.cxx
cui/source/tabpages/grfpage.cxx
cui/source/tabpages/macroass.cxx
cui/source/tabpages/measure.cxx
cui/source/tabpages/numfmt.cxx
cui/source/tabpages/numpages.cxx
cui/source/tabpages/page.cxx
cui/source/tabpages/paragrph.cxx
cui/source/tabpages/swpossizetabpage.cxx
cui/source/tabpages/tabarea.src
cui/source/tabpages/textanim.cxx
cui/source/tabpages/textattr.cxx
cui/source/tabpages/tparea.cxx
cui/source/tabpages/tpbitmap.cxx
cui/source/tabpages/tpcolor.cxx
cui/source/tabpages/tpgradnt.cxx
cui/source/tabpages/tphatch.cxx
cui/source/tabpages/tpline.cxx
cui/source/tabpages/tplnedef.cxx
cui/source/tabpages/tplneend.cxx
cui/source/tabpages/tpshadow.cxx
cui/source/tabpages/transfrm.cxx
embedserv/source/embed/register.cxx
extensions/inc/pch/precompiled_extensions.hxx
extensions/inc/propctrlr.hrc
extensions/source/abpilot/abpservices.cxx
extensions/source/bibliography/bibload.cxx
extensions/source/bibliography/datman.cxx
extensions/source/bibliography/general.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/inc/componentmodule.cxx
extensions/source/nsplugin/source/so_env.cxx
extensions/source/ole/oleobjw.cxx
extensions/source/ole/oleobjw.hxx
extensions/source/oooimprovement/invite_job.cxx
extensions/source/oooimprovement/onlogrotate_job.cxx
extensions/source/plugin/base/service.cxx
extensions/source/plugin/inc/plugin/unx/mediator.hxx
extensions/source/plugin/inc/plugin/unx/plugcon.hxx
extensions/source/plugin/unx/mediator.cxx
extensions/source/plugin/unx/nppapi.cxx
extensions/source/plugin/unx/plugcon.cxx
extensions/source/preload/services.cxx
extensions/source/propctrlr/formmetadata.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/resource/resource.cxx
extensions/source/scanner/sane.hxx
extensions/source/scanner/sanedlg.cxx
extensions/source/scanner/scanunx.cxx
extensions/source/scanner/scanwin.cxx
extensions/source/scanner/twain.cxx
extensions/source/scanner/twain.hxx
extensions/source/update/check/updatecheckconfig.cxx
extensions/test/stm/datatest.cxx
extensions/test/stm/marktest.cxx
extensions/test/stm/pipetest.cxx
extensions/test/stm/testfactreg.cxx
extensions/workben/testpgp.cxx
forms/qa/complex/forms/CheckOGroupBoxModel.java
forms/qa/makefile.mk
forms/source/component/Button.cxx
forms/source/component/Button.hxx
forms/source/component/ListBox.cxx
forms/source/inc/forms_module_impl.hxx
forms/source/misc/services.cxx
forms/source/solar/control/navtoolbar.cxx
javainstaller2/prj/build.lst
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
lingucomponent/prj/build.lst
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sreg.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/source/manifest/ManifestExport.cxx
package/source/manifest/UnoRegister.cxx
package/source/xstor/owriteablestream.cxx
package/source/xstor/owriteablestream.hxx
package/source/xstor/xstorage.hxx
package/source/zippackage/ZipPackageFolder.cxx
package/source/zippackage/ZipPackageStream.cxx
setup_native/source/mac/ooo/DS_Store
setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
xmlsecurity/prj/build.lst
xmlsecurity/source/component/registerservices.cxx
xmlsecurity/source/dialogs/stbcontrl.cxx
xmlsecurity/source/framework/xsec_framework.cxx
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
xmlsecurity/tools/demo/util.hxx
xmlsecurity/workben/signaturetest.cxx

3 files changed, 263 insertions, 1 deletions

diff --git a/forms/util/frm.component b/forms/util/frm.component
new file mode 100644
index 000000000000..c727e805940a
--- /dev/null
+++ b/forms/util/frm.component
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.form.ONavigationBarControl">
+    <service name="com.sun.star.form.control.NavigationToolBar"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.form.ONavigationBarModel">
+    <service name="com.sun.star.form.FormComponent"/>
+    <service name="com.sun.star.form.FormControlModel"/>
+    <service name="com.sun.star.form.component.NavigationToolBar"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.form.ORichTextControl">
+    <service name="com.sun.star.form.control.RichTextControl"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.forms.FormOperations">
+    <service name="com.sun.star.form.runtime.FormOperations"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.forms.ODatabaseForm">
+    <service name="com.sun.star.form.FormComponent"/>
+    <service name="com.sun.star.form.FormComponents"/>
+    <service name="com.sun.star.form.component.DataForm"/>
+    <service name="com.sun.star.form.component.Form"/>
+    <service name="com.sun.star.form.component.HTMLForm"/>
+    <service name="stardiv.one.form.component.Form"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.forms.OFilterControl">
+    <service name="com.sun.star.awt.UnoControl"/>
+    <service name="com.sun.star.form.control.FilterControl"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted">
+    <service name="com.sun.star.form.binding.BindableDatabaseFormattedField"/>
+    <service name="com.sun.star.form.component.DatabaseFormattedField"/>
+    <service name="com.sun.star.form.component.FormattedField"/>
+    <service name="stardiv.one.form.component.FormattedField"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.forms.ORichTextModel">
+    <service name="com.sun.star.form.FormComponent"/>
+    <service name="com.sun.star.form.FormControlModel"/>
+    <service name="com.sun.star.form.component.RichTextControl"/>
+    <service name="com.sun.star.style.CharacterProperties"/>
+    <service name="com.sun.star.style.CharacterPropertiesAsian"/>
+    <service name="com.sun.star.style.CharacterPropertiesComplex"/>
+    <service name="com.sun.star.style.ParagraphProperties"/>
+    <service name="com.sun.star.style.ParagraphPropertiesComplex"/>
+    <service name="com.sun.star.text.TextRange"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.forms.OScrollBarModel">
+    <service name="com.sun.star.form.FormComponent"/>
+    <service name="com.sun.star.form.FormControlModel"/>
+    <service name="com.sun.star.form.binding.BindableIntegerValueRange"/>
+    <service name="com.sun.star.form.component.ScrollBar"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.forms.OSpinButtonModel">
+    <service name="com.sun.star.form.FormComponent"/>
+    <service name="com.sun.star.form.FormControlModel"/>
+    <service name="com.sun.star.form.binding.BindableIntegerValueRange"/>
+    <service name="com.sun.star.form.component.SpinButton"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.xml.xpath.XFormsExtension">
+    <service name="com.sun.star.xml.xpath.XPathExtension"/>
+  </implementation>
+  <implementation name="com.sun.star.form.ImageProducer">
+    <service name="com.sun.star.awt.ImageProducer"/>
+  </implementation>
+  <implementation name="com.sun.star.form.Model">
+    <service name="com.sun.star.xforms.Model"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OButtonControl">
+    <service name="com.sun.star.form.control.CommandButton"/>
+    <service name="stardiv.one.form.control.CommandButton"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OButtonModel">
+    <service name="com.sun.star.form.component.CommandButton"/>
+    <service name="stardiv.one.form.component.CommandButton"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OCheckBoxControl">
+    <service name="com.sun.star.form.control.CheckBox"/>
+    <service name="stardiv.one.form.control.CheckBox"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OCheckBoxModel">
+    <service name="com.sun.star.form.binding.BindableDatabaseCheckBox"/>
+    <service name="com.sun.star.form.component.CheckBox"/>
+    <service name="com.sun.star.form.component.DatabaseCheckBox"/>
+    <service name="stardiv.one.form.component.CheckBox"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OComboBoxControl">
+    <service name="com.sun.star.form.control.ComboBox"/>
+    <service name="stardiv.one.form.control.ComboBox"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OComboBoxModel">
+    <service name="com.sun.star.form.binding.BindableDatabaseComboBox"/>
+    <service name="com.sun.star.form.component.ComboBox"/>
+    <service name="com.sun.star.form.component.DatabaseComboBox"/>
+    <service name="stardiv.one.form.component.ComboBox"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OCurrencyControl">
+    <service name="com.sun.star.form.control.CurrencyField"/>
+    <service name="stardiv.one.form.control.CurrencyField"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OCurrencyModel">
+    <service name="com.sun.star.form.component.CurrencyField"/>
+    <service name="com.sun.star.form.component.DatabaseCurrencyField"/>
+    <service name="stardiv.one.form.component.CurrencyField"/>
+  </implementation>
+  <implementation name="com.sun.star.form.ODateControl">
+    <service name="com.sun.star.form.control.DateField"/>
+    <service name="stardiv.one.form.control.DateField"/>
+  </implementation>
+  <implementation name="com.sun.star.form.ODateModel">
+    <service name="com.sun.star.form.component.DatabaseDateField"/>
+    <service name="com.sun.star.form.component.DateField"/>
+    <service name="stardiv.one.form.component.DateField"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OEditControl">
+    <service name="com.sun.star.form.control.TextField"/>
+    <service name="stardiv.one.form.control.Edit"/>
+    <service name="stardiv.one.form.control.TextField"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OEditModel">
+    <service name="com.sun.star.form.binding.BindableDatabaseTextField"/>
+    <service name="com.sun.star.form.component.DatabaseTextField"/>
+    <service name="com.sun.star.form.component.TextField"/>
+    <service name="stardiv.one.form.component.TextField"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OFileControlModel">
+    <service name="com.sun.star.form.component.FileControl"/>
+    <service name="stardiv.one.form.component.FileControl"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OFixedTextModel">
+    <service name="com.sun.star.form.component.FixedText"/>
+    <service name="stardiv.one.form.component.FixedText"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OFormattedControl">
+    <service name="com.sun.star.form.control.FormattedField"/>
+    <service name="stardiv.one.form.control.FormattedField"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OFormattedFieldWrapper">
+    <service name="stardiv.one.form.component.Edit"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OFormsCollection">
+    <service name="com.sun.star.form.Forms"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OGridControlModel">
+    <service name="com.sun.star.form.component.GridControl"/>
+    <service name="stardiv.one.form.component.Grid"/>
+    <service name="stardiv.one.form.component.GridControl"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OGroupBoxControl">
+    <service name="com.sun.star.form.control.GroupBox"/>
+    <service name="stardiv.one.form.control.GroupBox"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OGroupBoxModel">
+    <service name="com.sun.star.form.component.GroupBox"/>
+    <service name="stardiv.one.form.component.GroupBox"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OHiddenModel">
+    <service name="com.sun.star.form.component.HiddenControl"/>
+    <service name="stardiv.one.form.component.Hidden"/>
+    <service name="stardiv.one.form.component.HiddenControl"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OImageButtonControl">
+    <service name="com.sun.star.form.control.ImageButton"/>
+    <service name="stardiv.one.form.control.ImageButton"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OImageButtonModel">
+    <service name="com.sun.star.form.component.ImageButton"/>
+    <service name="stardiv.one.form.component.ImageButton"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OImageControlControl">
+    <service name="com.sun.star.form.control.ImageControl"/>
+    <service name="stardiv.one.form.control.ImageControl"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OImageControlModel">
+    <service name="com.sun.star.form.component.DatabaseImageControl"/>
+    <service name="stardiv.one.form.component.ImageControl"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OListBoxControl">
+    <service name="com.sun.star.form.control.ListBox"/>
+    <service name="stardiv.one.form.control.ListBox"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OListBoxModel">
+    <service name="com.sun.star.form.binding.BindableDatabaseListBox"/>
+    <service name="com.sun.star.form.component.DatabaseListBox"/>
+    <service name="com.sun.star.form.component.ListBox"/>
+    <service name="stardiv.one.form.component.ListBox"/>
+  </implementation>
+  <implementation name="com.sun.star.form.ONumericControl">
+    <service name="com.sun.star.form.control.NumericField"/>
+    <service name="stardiv.one.form.control.NumericField"/>
+  </implementation>
+  <implementation name="com.sun.star.form.ONumericModel">
+    <service name="com.sun.star.form.binding.BindableDatabaseNumericField"/>
+    <service name="com.sun.star.form.component.DatabaseNumericField"/>
+    <service name="com.sun.star.form.component.NumericField"/>
+    <service name="stardiv.one.form.component.NumericField"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OPatternControl">
+    <service name="com.sun.star.form.control.PatternField"/>
+    <service name="stardiv.one.form.control.PatternField"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OPatternModel">
+    <service name="com.sun.star.form.component.DatabasePatternField"/>
+    <service name="com.sun.star.form.component.PatternField"/>
+    <service name="stardiv.one.form.component.PatternField"/>
+  </implementation>
+  <implementation name="com.sun.star.form.ORadioButtonControl">
+    <service name="com.sun.star.form.control.RadioButton"/>
+    <service name="stardiv.one.form.control.RadioButton"/>
+  </implementation>
+  <implementation name="com.sun.star.form.ORadioButtonModel">
+    <service name="com.sun.star.form.binding.BindableDatabaseRadioButton"/>
+    <service name="com.sun.star.form.component.DatabaseRadioButton"/>
+    <service name="com.sun.star.form.component.RadioButton"/>
+    <service name="stardiv.one.form.component.RadioButton"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OTimeControl">
+    <service name="com.sun.star.form.control.TimeField"/>
+    <service name="stardiv.one.form.control.TimeField"/>
+  </implementation>
+  <implementation name="com.sun.star.form.OTimeModel">
+    <service name="com.sun.star.form.component.DatabaseTimeField"/>
+    <service name="com.sun.star.form.component.TimeField"/>
+    <service name="stardiv.one.form.component.TimeField"/>
+  </implementation>
+  <implementation name="com.sun.star.form.XForms">
+    <service name="com.sun.star.xforms.XForms"/>
+  </implementation>
+</component>
diff --git a/forms/util/frm.dxp b/forms/util/frm.dxp
index 9e59e94034a6..f0e1c69934bc 100644
--- a/forms/util/frm.dxp
+++ b/forms/util/frm.dxp
@@ -1,3 +1,2 @@
-component_writeInfo
 component_getImplementationEnvironment
 component_getFactory
diff --git a/forms/util/makefile.mk b/forms/util/makefile.mk
index 79869f0fe8ed..fa7cb791b5e1 100644
--- a/forms/util/makefile.mk
+++ b/forms/util/makefile.mk
@@ -111,3 +111,11 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
     @echo NavigationToolBar     >>$@
     @echo ONavigationBar        >>$@
 
+
+ALLTAR : $(MISC)/frm.component
+
+$(MISC)/frm.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        frm.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt frm.component